Revert 225425 "Client Hints"

> Client Hints > > Client Hints can be used as input to proactive content negotiation; > just as the Accept header allowed clients to indicate what formats > they prefer, Client Hints allow clients to indicate a list of device > and agent specific preferences. > > See: > https://github.com/igrigorik/http-client-hints/blob/draft2/draft-grigorik-http-client-hints-01.txt > > Patched from https://codereview.chromium.org/23654014/, which was > patched from https://codereview.chromium.org/11970002 > > BUG=170388 > CONTRIBUTOR=yoav@yoav.ws > > Review URL: https://codereview.chromium.org/24451003 TBR=bengr@chromium.org Review URL: https://codereview.chromium.org/24824003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225568 0039d316-1c4b-4281-b951-d872f2087c98
marcosholgado · Sep 26, 2013 · 5082909 · 5082909
1 parent e4411fb
commit 5082909
Show file tree

Hide file tree

Showing 12 changed files with 0 additions and 194 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -285,7 +285,6 @@ Yael Aharon <yael.aharon@intel.com>
 Yair Yogev <progame@chromium.org>
 Yang Gu <yang.gu@intel.com>
 Yarin Kaul <yarin.kaul@gmail.com>
-Yoav Weiss <yoav@yoav.ws>
 Yoav Zilberberg <yoav.zilberberg@gmail.com>
 Yong Shin <sy3620@gmail.com>
 Yongsheng Zhu <yongsheng.zhu@intel.com>

diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
@@ -511,8 +511,6 @@ void IOThread::InitAsync() {
   ChromeNetworkDelegate* network_delegate =
       new ChromeNetworkDelegate(extension_event_router_forwarder_,
                                 &system_enable_referrers_);
-  if (command_line.HasSwitch(switches::kEnableClientHints))
-    network_delegate->SetEnableClientHints();
   if (command_line.HasSwitch(switches::kDisableExtensionsHttpThrottling))
     network_delegate->NeverThrottleRequests();
   globals_->system_network_delegate.reset(network_delegate);

diff --git a/chrome/browser/net/chrome_network_delegate.cc b/chrome/browser/net/chrome_network_delegate.cc
@@ -30,7 +30,6 @@
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_util.h"
 #include "chrome/browser/net/chrome_network_data_saving_metrics.h"
-#include "chrome/browser/net/client_hints.h"
 #include "chrome/browser/net/connect_interceptor.h"
 #include "chrome/browser/net/load_time_stats.h"
 #include "chrome/browser/performance_monitor/performance_monitor.h"
@@ -335,11 +334,6 @@ void ChromeNetworkDelegate::set_predictor(
       new chrome_browser_net::ConnectInterceptor(predictor));
 }
 
-void ChromeNetworkDelegate::SetEnableClientHints() {
-  client_hints_.reset(new ClientHints());
-  client_hints_->Init();
-}
-
 // static
 void ChromeNetworkDelegate::NeverThrottleRequests() {
   g_never_throttle_requests_ = true;
@@ -424,12 +418,6 @@ int ChromeNetworkDelegate::OnBeforeURLRequest(
   if (enable_do_not_track_ && enable_do_not_track_->GetValue())
     request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
 
-  if (client_hints_) {
-    request->SetExtraRequestHeaderByName(
-        ClientHints::kDevicePixelRatioHeader,
-        client_hints_->GetDevicePixelRatioHeader(), true);
-  }
-
   bool force_safe_search = force_google_safe_search_ &&
                            force_google_safe_search_->GetValue();
 

diff --git a/chrome/browser/net/chrome_network_delegate.h b/chrome/browser/net/chrome_network_delegate.h
@@ -10,11 +10,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/values.h"
 #include "net/base/network_delegate.h"
 
-class ClientHints;
 class CookieSettings;
 class ExtensionInfoMap;
 class PrefService;
@@ -92,9 +90,6 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
     force_google_safe_search_ = force_google_safe_search;
   }
 
-  // Adds the Client Hints header to HTTP requests.
-  void SetEnableClientHints();
-
   // Causes |OnCanThrottleRequest| to always return false, for all
   // instances of this object.
   static void NeverThrottleRequests();
@@ -212,8 +207,6 @@ class ChromeNetworkDelegate : public net::NetworkDelegate {
   // Total original size of all content before it was transferred.
   int64 original_content_length_;
 
-  scoped_ptr<ClientHints> client_hints_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeNetworkDelegate);
 };
 

diff --git a/chrome/browser/net/client_hints.cc b/chrome/browser/net/client_hints.cc
diff --git a/chrome/browser/net/client_hints.h b/chrome/browser/net/client_hints.h
diff --git a/chrome/browser/net/client_hints_unittest.cc b/chrome/browser/net/client_hints_unittest.cc
diff --git a/chrome/browser/profiles/profile_io_data.cc b/chrome/browser/profiles/profile_io_data.cc
@@ -772,8 +772,6 @@ void ProfileIOData::Init(content::ProtocolHandlerMap* protocol_handlers) const {
       new ChromeNetworkDelegate(
           io_thread_globals->extension_event_router_forwarder.get(),
           &enable_referrers_);
-  if (command_line.HasSwitch(switches::kEnableClientHints))
-    network_delegate->SetEnableClientHints();
   network_delegate->set_extension_info_map(
       profile_params_->extension_info_map.get());
   network_delegate->set_url_blacklist_manager(url_blacklist_manager_.get());

diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
@@ -1184,8 +1184,6 @@
         'browser/net/chrome_network_delegate.h',
         'browser/net/chrome_url_request_context.cc',
         'browser/net/chrome_url_request_context.h',
-        'browser/net/client_hints.cc',
-        'browser/net/client_hints.h',
         'browser/net/connect_interceptor.cc',
         'browser/net/connect_interceptor.h',
         'browser/net/connection_tester.cc',

diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
@@ -1001,7 +1001,6 @@
         'browser/net/chrome_fraudulent_certificate_reporter_unittest.cc',
         'browser/net/chrome_network_data_saving_metrics_unittest.cc',
         'browser/net/chrome_network_delegate_unittest.cc',
-        'browser/net/client_hints_unittest.cc',
         'browser/net/connection_tester_unittest.cc',
         'browser/net/dns_probe_runner_unittest.cc',
         'browser/net/dns_probe_service_unittest.cc',

diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
@@ -559,9 +559,6 @@ const char kEnableBatchedShutdown[]         = "enable-batched-shutdown";
 // Enables the benchmarking extensions.
 const char kEnableBenchmarking[]            = "enable-benchmarking";
 
-// Enables client hints, which adds hints about browser state to HTTP requests.
-const char kEnableClientHints[]             = "enable-client-hints";
-
 // Enables pushing cloud policy to Chrome using an invalidation service.
 const char kEnableCloudPolicyPush[]         = "enable-cloud-policy-push";
 

diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
@@ -166,7 +166,6 @@ extern const char kEnableAuthNegotiatePort[];
 extern const char kEnableAutologin[];
 extern const char kEnableBatchedShutdown[];
 extern const char kEnableBenchmarking[];
-extern const char kEnableClientHints[];
 extern const char kEnableCloudPolicyPush[];
 extern const char kEnableCloudPrintProxy[];
 extern const char kEnableComponentCloudPolicy[];