Add SocketWatcherFactory as a helper class to NQE

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 1274 matching lines @@
 scoped_ptr<net::HttpNetworkSession> ProfileIOData::CreateHttpNetworkSession(
     const ProfileParams& profile_params) const {
   net::HttpNetworkSession::Params params;
   net::URLRequestContext* context = main_request_context();
 
   IOThread* const io_thread = profile_params.io_thread;
 
   io_thread->InitializeNetworkSessionParams(&params);
   net::URLRequestContextBuilder::SetHttpNetworkSessionComponents(context,
                                                                  &params);
-  if (!IsOffTheRecord()) {
+  if (!IsOffTheRecord() && io_thread->globals()->network_quality_estimator) {
     params.socket_performance_watcher_factory =
-        io_thread->globals()->network_quality_estimator.get();
+        io_thread->globals()
+            ->network_quality_estimator->GetSocketPerformanceWatcherFactory();

[mmenke, 2016/04/05 15:45:38]

If this is a global, should it be hooked up to the IOThread's
URLRequestContexts?  Both the system one and the proxy one.

[tbansal1, 2016/04/05 17:30:38]

That makes sense. I should move this to URLRequestContext instead of Params (CL
coming soon).

   }
   if (data_reduction_proxy_io_data_.get())
     params.proxy_delegate = data_reduction_proxy_io_data_->proxy_delegate();
 
   return scoped_ptr<net::HttpNetworkSession>(
       new net::HttpNetworkSession(params));
 }
 
 scoped_ptr<net::HttpCache> ProfileIOData::CreateMainHttpFactory(
     net::HttpNetworkSession* session,
@@ skipping 11 matching lines @@
       make_scoped_ptr(new DevToolsNetworkTransactionFactory(
           network_controller_handle_.GetController(), shared_session)),
       std::move(backend), true /* set_up_quic_server_info */));
 }
 
 void ProfileIOData::SetCookieSettingsForTesting(
     content_settings::CookieSettings* cookie_settings) {
   DCHECK(!cookie_settings_.get());
   cookie_settings_ = cookie_settings;
 }