Plumb NQP to context and to http_proxy_client_socket_pool

chrome/browser/profiles/profile_io_data.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/profiles/profile_io_data.h"
 
 #include <stddef.h>
 
 #include <string>
 #include <utility>
@@ skipping 1294 matching lines @@
 std::unique_ptr<net::HttpNetworkSession>
 ProfileIOData::CreateHttpNetworkSession(
     const ProfileParams& profile_params) const {
   net::URLRequestContext* context = main_request_context();
 
   IOThread* const io_thread = profile_params.io_thread;
 
   net::HttpNetworkSession::Context session_context;
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(
       context, &session_context);
-  if (!IsOffTheRecord() && io_thread->globals()->network_quality_estimator) {
-    session_context.socket_performance_watcher_factory =
-        io_thread->globals()
-            ->network_quality_estimator->GetSocketPerformanceWatcherFactory();
-  }
+  DCHECK(io_thread->globals()->network_quality_estimator);
+  session_context.socket_performance_watcher_factory =
+      io_thread->globals()
+          ->network_quality_estimator->GetSocketPerformanceWatcherFactory();

[mmenke, 2017/06/05 20:04:25]

Is hooking this up in incognito mode a critical part of this CL?  Whether it is
or not, mind landing this change separately, and making sure you have a signoff
from the privacy team?  I don't see an issue, but I'll defer to them.

[tbansal1, 2017/06/07 18:13:44]

Done.

+  session_context.network_quality_estimator =
+      io_thread->globals()->network_quality_estimator.get();

[mmenke, 2017/06/05 20:04:25]

Not needed, since it's plugged into SetHttpNetworkSessionComponents, a couple
lines up.

[tbansal1, 2017/06/07 18:13:44]

Done.

+
   if (data_reduction_proxy_io_data_.get()) {
     session_context.proxy_delegate =
         data_reduction_proxy_io_data_->proxy_delegate();
   }
 
   return std::unique_ptr<net::HttpNetworkSession>(new net::HttpNetworkSession(
       io_thread->NetworkSessionParams(), session_context));
 }
 
 std::unique_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
@@ skipping 26 matching lines @@
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }
 
 policy::URLBlacklist::URLBlacklistState ProfileIOData::GetURLBlacklistState(
     const GURL& url) const {
   return url_blacklist_manager_->GetURLBlacklistState(url);
 }