Remove socket performance watcher factory from URL request context builder

net/url_request/url_request_context_builder.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 "net/url_request/url_request_context_builder.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 192 matching lines @@
 #endif
 #if !BUILDFLAG(DISABLE_FTP_SUPPORT)
       ftp_enabled_(false),
 #endif
       http_cache_enabled_(true),
       throttling_enabled_(false),
       sdch_enabled_(false),
       cookie_store_set_by_client_(false),
       net_log_(nullptr),
       pac_quick_check_enabled_(true),
-      pac_sanitize_url_policy_(ProxyService::SanitizeUrlPolicy::SAFE),
-      socket_performance_watcher_factory_(nullptr) {
+      pac_sanitize_url_policy_(ProxyService::SanitizeUrlPolicy::SAFE) {
 }
 
 URLRequestContextBuilder::~URLRequestContextBuilder() {}
 
 void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
     const URLRequestContext* request_context,
     HttpNetworkSession::Context* session_context) {
   session_context->host_resolver = request_context->host_resolver();
   session_context->cert_verifier = request_context->cert_verifier();
   session_context->transport_security_state =
       request_context->transport_security_state();
   session_context->cert_transparency_verifier =
       request_context->cert_transparency_verifier();
   session_context->ct_policy_enforcer = request_context->ct_policy_enforcer();
   session_context->proxy_service = request_context->proxy_service();
   session_context->ssl_config_service = request_context->ssl_config_service();
   session_context->http_auth_handler_factory =
       request_context->http_auth_handler_factory();
   session_context->http_server_properties =
       request_context->http_server_properties();
   session_context->net_log = request_context->net_log();
   session_context->channel_id_service = request_context->channel_id_service();
   session_context->network_quality_provider =
       request_context->network_quality_estimator();
+  if (request_context->network_quality_estimator()) {
+    session_context->socket_performance_watcher_factory =
+        request_context->network_quality_estimator()
+            ->GetSocketPerformanceWatcherFactory();

[mmenke, 2017/06/09 16:32:13]

The "session_context.socket_performance_watcher_factory =" line can be removed
from profile_io_data now, too.

[mmenke, 2017/06/09 16:32:13]

Also, it looks like socket_performance_watcher_factory was not being hooked up
to the system request context, but the NQE is.  I assume that means this CL is
fixing a bug?

[tbansal1, 2017/06/09 16:45:06]

Yes, for some contexts (e.g., off the record), SPWF was null while NQE was not.
There was no reason to set NQE while keeping SPWF null.

[tbansal1, 2017/06/09 16:45:06]

Done.

+  }
 }
 
 void URLRequestContextBuilder::EnableHttpCache(const HttpCacheParams& params) {
   http_cache_enabled_ = true;
   http_cache_params_ = params;
 }
 
 void URLRequestContextBuilder::DisableHttpCache() {
   http_cache_enabled_ = false;
   http_cache_params_ = HttpCacheParams();
@@ skipping 168 matching lines @@
   }
   storage->set_proxy_service(std::move(proxy_service_));
 
   HttpNetworkSession::Context network_session_context;
   SetHttpNetworkSessionComponents(context.get(), &network_session_context);
 
   if (proxy_delegate_) {
     network_session_context.proxy_delegate = proxy_delegate_.get();
     storage->set_proxy_delegate(std::move(proxy_delegate_));
   }
-  if (socket_performance_watcher_factory_) {
-    network_session_context.socket_performance_watcher_factory =
-        socket_performance_watcher_factory_;
-    DCHECK(network_session_context.network_quality_provider);
-  }
 
   storage->set_http_network_session(base::MakeUnique<HttpNetworkSession>(
       http_network_session_params_, network_session_context));
 
   std::unique_ptr<HttpTransactionFactory> http_transaction_factory;
   if (http_cache_enabled_) {
     std::unique_ptr<HttpCache::BackendFactory> http_cache_backend;
     if (http_cache_params_.type != HttpCacheParams::IN_MEMORY) {
       BackendType backend_type =
           http_cache_params_.type == HttpCacheParams::DISK
@@ skipping 64 matching lines @@
     std::unique_ptr<ProxyConfigService> proxy_config_service,
     URLRequestContext* url_request_context,
     HostResolver* host_resolver,
     NetworkDelegate* network_delegate,
     NetLog* net_log) {
   return ProxyService::CreateUsingSystemProxyResolver(
       std::move(proxy_config_service), net_log);
 }
 
 }  // namespace net