Disable Channel ID

android_webview/browser/net/aw_url_request_context_getter.cc

Index: android_webview/browser/net/aw_url_request_context_getter.cc
diff --git a/android_webview/browser/net/aw_url_request_context_getter.cc b/android_webview/browser/net/aw_url_request_context_getter.cc
index 22666fbbea33cd4feec42e9272b07a0d460ed381..f21ea435305f9cde3e50a9eda6ad22380ff3d1ee 100644
--- a/android_webview/browser/net/aw_url_request_context_getter.cc
+++ b/android_webview/browser/net/aw_url_request_context_getter.cc
@@ -208,11 +208,15 @@ void AwURLRequestContextGetter::InitializeURLRequestContext() {
   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;