|  | @@ -291,7 +291,7 @@ class ChannelData {
 | 
	
		
			
				|  |  |    RefCountedPtr<ServiceConfig> saved_service_config_;
 | 
	
		
			
				|  |  |    bool received_first_resolver_result_ = false;
 | 
	
		
			
				|  |  |    // The number of SubchannelWrapper instances referencing a given Subchannel.
 | 
	
		
			
				|  |  | -  std::map<Subchannel*, int> subchannel_refcount_map_;
 | 
	
		
			
				|  |  | +  Map<Subchannel*, int> subchannel_refcount_map_;
 | 
	
		
			
				|  |  |    // The set of SubchannelWrappers that currently exist.
 | 
	
		
			
				|  |  |    // No need to hold a ref, since the map is updated in the control-plane
 | 
	
		
			
				|  |  |    // combiner when the SubchannelWrappers are created and destroyed.
 | 
	
	
		
			
				|  | @@ -299,8 +299,8 @@ class ChannelData {
 | 
	
		
			
				|  |  |    // Pending ConnectedSubchannel updates for each SubchannelWrapper.
 | 
	
		
			
				|  |  |    // Updates are queued here in the control plane combiner and then applied
 | 
	
		
			
				|  |  |    // in the data plane mutex when the picker is updated.
 | 
	
		
			
				|  |  | -  std::map<RefCountedPtr<SubchannelWrapper>, RefCountedPtr<ConnectedSubchannel>,
 | 
	
		
			
				|  |  | -           RefCountedPtrLess<SubchannelWrapper>>
 | 
	
		
			
				|  |  | +  Map<RefCountedPtr<SubchannelWrapper>, RefCountedPtr<ConnectedSubchannel>,
 | 
	
		
			
				|  |  | +      RefCountedPtrLess<SubchannelWrapper>>
 | 
	
		
			
				|  |  |        pending_subchannel_updates_;
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |    //
 | 
	
	
		
			
				|  | @@ -321,7 +321,7 @@ class ChannelData {
 | 
	
		
			
				|  |  |    // synchronously via grpc_channel_num_external_connectivity_watchers().
 | 
	
		
			
				|  |  |    //
 | 
	
		
			
				|  |  |    mutable Mutex external_watchers_mu_;
 | 
	
		
			
				|  |  | -  std::map<grpc_closure*, ExternalConnectivityWatcher*> external_watchers_;
 | 
	
		
			
				|  |  | +  Map<grpc_closure*, ExternalConnectivityWatcher*> external_watchers_;
 | 
	
		
			
				|  |  |  };
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  //
 | 
	
	
		
			
				|  | @@ -1116,7 +1116,7 @@ class ChannelData::SubchannelWrapper : public SubchannelInterface {
 | 
	
		
			
				|  |  |    // subchannel.  This is needed so that when the LB policy calls
 | 
	
		
			
				|  |  |    // CancelConnectivityStateWatch() with its watcher, we know the
 | 
	
		
			
				|  |  |    // corresponding WrapperWatcher to cancel on the underlying subchannel.
 | 
	
		
			
				|  |  | -  std::map<ConnectivityStateWatcherInterface*, WatcherWrapper*> watcher_map_;
 | 
	
		
			
				|  |  | +  Map<ConnectivityStateWatcherInterface*, WatcherWrapper*> watcher_map_;
 | 
	
		
			
				|  |  |    // To be accessed only in the control plane combiner.
 | 
	
		
			
				|  |  |    RefCountedPtr<ConnectedSubchannel> connected_subchannel_;
 | 
	
		
			
				|  |  |    // To be accessed only in the data plane mutex.
 |