Revert 132479 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA en…

chrome/browser/net/chrome_network_delegate.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 "chrome/browser/net/chrome_network_delegate.h"
 
 #include "base/logging.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/api/proxy/proxy_api.h"
 #include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/extension_event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
-#include "chrome/browser/google/google_util.h"
-#include "chrome/browser/metrics/metrics_service.h"
 #include "chrome/browser/prefs/pref_member.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_info.h"
 #include "net/base/host_port_pair.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_log.h"
@@ skipping 131 matching lines @@
   if (!enable_referrers_->GetValue())
     request->set_referrer(std::string());
   return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeRequest(
       profile_, extension_info_map_.get(), request, callback, new_url);
 }
 
 int ChromeNetworkDelegate::OnBeforeSendHeaders(
     net::URLRequest* request,
     const net::CompletionCallback& callback,
     net::HttpRequestHeaders* headers) {
-  // Attach any applicable Chrome metrics headers. This is a best-effort attempt
-  // where failure will not cause OnBeforeSendHeaders to back out.
-  AddChromeMetricsStateHeader(request, headers);
-
   return ExtensionWebRequestEventRouter::GetInstance()->OnBeforeSendHeaders(
       profile_, extension_info_map_.get(), request, callback, headers);
 }
 
 void ChromeNetworkDelegate::OnSendHeaders(
     net::URLRequest* request,
     const net::HttpRequestHeaders& headers) {
   ExtensionWebRequestEventRouter::GetInstance()->OnSendHeaders(
       profile_, extension_info_map_.get(), request, headers);
 }
@@ skipping 119 matching lines @@
     BrowserThread::PostTask(
         BrowserThread::UI, FROM_HERE,
         base::Bind(&TabSpecificContentSettings::CookieChanged,
                    render_process_id, render_view_id,
                    request->url(), request->first_party_for_cookies(),
                    cookie_line, *options, !allow));
   }
 
   return allow;
 }
-
-void ChromeNetworkDelegate::AddChromeMetricsStateHeader(
-    net::URLRequest* request,
-    net::HttpRequestHeaders* headers) {
-  // Note our criteria for attaching Chrome experiment headers:
-  // 1. We only transmit to *.google.<TLD> domains. NOTE that this use of
-  //    google_util helpers to check this does not guarantee that the URL is
-  //    Google-owned, only that it is of the form *.google.<TLD>. In the future
-  //    we may choose to reinforce this check.
-  // 2. We must verify that the transmitting profile is not off the record.
-  // 3. For the X-Chrome-UMA-Enabled bit, we only set it if UMA is in fact
-  //    enabled for this install of Chrome.
-  Profile* profile_instance = reinterpret_cast<Profile*>(profile_);
-  if (google_util::IsGoogleDomainUrl(request->url().spec(),
-                                     google_util::ALLOW_SUBDOMAIN) &&
-      profile_instance && !profile_instance->IsOffTheRecord() &&
-      MetricsServiceHelper::IsMetricsReportingEnabled()) {
-    headers->SetHeader("X-Chrome-UMA-Enabled", "1");
-  }
-}