Disable Channel ID

android_webview/browser/net/aw_url_request_context_getter.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/net/aw_url_request_context_getter.h"
 
 #include <vector>
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
@@ skipping 190 matching lines @@
   } else {
     builder.set_proxy_config_service(
         net::ProxyService::CreateSystemProxyConfigService(
             GetNetworkTaskRunner(), NULL /* Ignored on Android */ ));
   }
   builder.set_accept_language(net::HttpUtil::GenerateAcceptLanguageHeader(
       AwContentBrowserClient::GetAcceptLangsImpl()));
   ApplyCmdlineOverridesToURLRequestContextBuilder(&builder);
 
   url_request_context_.reset(builder.Build());
+  // TODO(sgurun) Enable once we provide a better way to control this mechanism.
+  // See b/17177684

[boliu, 2014/08/23 16:35:58]

nit: we generally don't put internal bugs into chormium source or CL
descriptions. File a crbug which can refer to an internal bug, or in this case,
I don't even think it needs one

+  #if 0
   channel_id_service_.reset(
       new net::ChannelIDService(
           new net::DefaultChannelIDStore(NULL),
           base::WorkerPool::GetTaskRunner(true)));
   url_request_context_->set_channel_id_service(channel_id_service_.get());
+  #endif
   // TODO(mnaganov): Fix URLRequestContextBuilder to use proper threads.
   net::HttpNetworkSession::Params network_session_params;
 
   PopulateNetworkSessionParams(url_request_context_.get(),
                                &network_session_params);
 
   net::HttpCache* main_cache = new net::HttpCache(
       network_session_params,
       new net::HttpCache::DefaultBackend(
           net::DISK_CACHE,
@@ skipping 49 matching lines @@
   std::swap(protocol_handlers_, *protocol_handlers);
   request_interceptors_.swap(request_interceptors);
 }
 
 data_reduction_proxy::DataReductionProxyAuthRequestHandler*
 AwURLRequestContextGetter::GetDataReductionProxyAuthRequestHandler() const {
   return data_reduction_proxy_auth_request_handler_.get();
 }
 
 }  // namespace android_webview