Added Client-Hints.

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 <vector>
 
 #include "base/base_paths.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/path_service.h"
 #include "base/prefs/public/pref_member.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.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/event_router_forwarder.h"
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/google/google_util.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"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/task_manager/task_manager.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
@@ skipping 31 matching lines @@
 bool ChromeNetworkDelegate::g_allow_file_access_ = true;
 #endif
 
 // This remains false unless the --disable-extensions-http-throttling
 // flag is passed to the browser.
 bool ChromeNetworkDelegate::g_never_throttle_requests_ = false;
 
 namespace {
 
 const char kDNTHeader[] = "DNT";
+const char kClientHintsHeader[] = "Client-Hints";
 
 // If the |request| failed due to problems with a proxy, forward the error to
 // the proxy extension API.
 void ForwardProxyErrors(net::URLRequest* request,
                         extensions::EventRouterForwarder* event_router,
                         void* profile) {
   if (request->status().status() == net::URLRequestStatus::FAILED) {
     switch (request->status().error()) {
       case net::ERR_PROXY_AUTH_UNSUPPORTED:
       case net::ERR_PROXY_CONNECTION_FAILED:
@@ skipping 172 matching lines @@
                        original_content_length);
   UMA_HISTOGRAM_COUNTS("Net.HttpContentLengthDifference",
                        original_content_length - received_content_length);
 #endif
 }
 
 }  // namespace
 
 ChromeNetworkDelegate::ChromeNetworkDelegate(
     extensions::EventRouterForwarder* event_router,
-    BooleanPrefMember* enable_referrers)
+    BooleanPrefMember* enable_referrers, bool enable_client_hints)
     : event_router_(event_router),
       profile_(NULL),
       enable_referrers_(enable_referrers),
       enable_do_not_track_(NULL),
       force_google_safe_search_(NULL),
       url_blacklist_manager_(NULL),
       load_time_stats_(NULL),
       received_content_length_(0),
-      original_content_length_(0) {
+      original_content_length_(0),
+      client_hints_(enable_client_hints ? new ClientHints() : NULL){
   DCHECK(event_router);
   DCHECK(enable_referrers);
+  if (client_hints_ != NULL) {

[Ryan Sleevi, 2013/02/08 22:12:53]

Just use a bool check, rather than NULL

if (client_hints_) { }

This works regardless of the storage used for the client hints (eg:
scoped_ptr.get() semantics, implicit pointers, etc)

[bengr, 2013/02/26 01:57:20]

Done.

+    client_hints_->RetrieveScreenInfo();
+  }
 }
 
 ChromeNetworkDelegate::~ChromeNetworkDelegate() {}
 
 void ChromeNetworkDelegate::set_extension_info_map(
     ExtensionInfoMap* extension_info_map) {
   extension_info_map_ = extension_info_map;
 }
 
 void ChromeNetworkDelegate::set_cookie_settings(
@@ skipping 84 matching lines @@
   }
 #endif
 
   ForwardRequestStatus(REQUEST_STARTED, request, profile_);
 
   if (!enable_referrers_->GetValue())
     request->set_referrer(std::string());
   if (enable_do_not_track_ && enable_do_not_track_->GetValue())
     request->SetExtraRequestHeaderByName(kDNTHeader, "1", true /* override */);
 
+  if (client_hints_ != NULL) {
+    std::string client_hints_value = client_hints_->GetScreenInfoHints();

[igrigorik, 2013/02/09 17:06:30]

Hmm, this would fetch screen.{width,height} on every request, correct? If so,
orientation changes would switch the w/h values in the header. Is there a
simpler approach to just report them as fixed portrait mode? The idea being.. we
don't want to communicate orientation, just the device width and height, which
is fixed.

[bengr, 2013/02/26 01:57:20]

It does not fetch screen height/width on every request. It gets the hints string
on every request. The updating of that string is triggered by
ClientHints::RetrieveScreenInfo(), which only happens once when client hints is
first enabled.

On 2013/02/09 17:06:30, igrigorik wrote:

+    request->SetExtraRequestHeaderByName(kClientHintsHeader,
+                                         client_hints_value, true);
+    DVLOG(2) << kClientHintsHeader << ": " << client_hints_value
+        << " for " << request->url().spec();

[Ryan Sleevi, 2013/02/08 22:12:53]

Align your streams - see http://dev.chromium.org/developers/coding-style

[bengr, 2013/02/26 01:57:20]

Done.

+  }
+
   bool force_safe_search = force_google_safe_search_ &&
                            force_google_safe_search_->GetValue();
 
   net::CompletionCallback wrapped_callback = callback;
   if (force_safe_search) {
     wrapped_callback = base::Bind(&ForceGoogleSafeSearchCallbackWrapper,
                                   callback,
                                   base::Unretained(request),
                                   base::Unretained(new_url));
   }
@@ skipping 276 matching lines @@
 
 void ChromeNetworkDelegate::AccumulateContentLength(
     int64 received_content_length, int64 original_content_length) {
   DCHECK_GE(received_content_length, 0);
   DCHECK_GE(original_content_length, 0);
   StoreAccumulatedContentLength(received_content_length,
                                 original_content_length);
   received_content_length_ += received_content_length;
   original_content_length_ += original_content_length;
 }