|  | @@ -118,7 +118,7 @@ std::shared_ptr<Channel> CreateTestChannel(
 | 
	
		
			
				|  |  |    if (creds.get()) {
 | 
	
		
			
				|  |  |      channel_creds = CompositeChannelCredentials(channel_creds, creds);
 | 
	
		
			
				|  |  |    }
 | 
	
		
			
				|  |  | -  return CreateCustomChannel(server, channel_creds, channel_args);
 | 
	
		
			
				|  |  | +  return ::grpc::CreateCustomChannel(server, channel_creds, channel_args);
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  std::shared_ptr<Channel> CreateTestChannel(
 | 
	
	
		
			
				|  | @@ -132,7 +132,7 @@ std::shared_ptr<Channel> CreateTestChannel(
 | 
	
		
			
				|  |  |    std::shared_ptr<ChannelCredentials> channel_creds;
 | 
	
		
			
				|  |  |    if (cred_type.empty()) {
 | 
	
		
			
				|  |  |      if (interceptor_creators.empty()) {
 | 
	
		
			
				|  |  | -      return CreateCustomChannel(server, InsecureChannelCredentials(), args);
 | 
	
		
			
				|  |  | +      return ::grpc::CreateCustomChannel(server, InsecureChannelCredentials(), args);
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |        return experimental::CreateCustomChannelWithInterceptors(
 | 
	
		
			
				|  |  |            server, InsecureChannelCredentials(), args,
 | 
	
	
		
			
				|  | @@ -159,7 +159,7 @@ std::shared_ptr<Channel> CreateTestChannel(
 | 
	
		
			
				|  |  |        channel_creds = CompositeChannelCredentials(channel_creds, creds);
 | 
	
		
			
				|  |  |      }
 | 
	
		
			
				|  |  |      if (interceptor_creators.empty()) {
 | 
	
		
			
				|  |  | -      return CreateCustomChannel(connect_to, channel_creds, channel_args);
 | 
	
		
			
				|  |  | +      return ::grpc::CreateCustomChannel(connect_to, channel_creds, channel_args);
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |        return experimental::CreateCustomChannelWithInterceptors(
 | 
	
		
			
				|  |  |            connect_to, channel_creds, channel_args,
 | 
	
	
		
			
				|  | @@ -171,7 +171,7 @@ std::shared_ptr<Channel> CreateTestChannel(
 | 
	
		
			
				|  |  |      GPR_ASSERT(channel_creds != nullptr);
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |      if (interceptor_creators.empty()) {
 | 
	
		
			
				|  |  | -      return CreateCustomChannel(server, channel_creds, args);
 | 
	
		
			
				|  |  | +      return ::grpc::CreateCustomChannel(server, channel_creds, args);
 | 
	
		
			
				|  |  |      } else {
 | 
	
		
			
				|  |  |        return experimental::CreateCustomChannelWithInterceptors(
 | 
	
		
			
				|  |  |            server, channel_creds, args, std::move(interceptor_creators));
 |