Remove socket performance watcher factory from URL request context builder

net/url_request/url_request_context_builder.cc

Index: net/url_request/url_request_context_builder.cc
diff --git a/net/url_request/url_request_context_builder.cc b/net/url_request/url_request_context_builder.cc
index 4851b2f0512a2599f07a231471881f5ceced3158..85a19f401ad5d3bb124fdcd8a7de6a78df4321ff 100644
--- a/net/url_request/url_request_context_builder.cc
+++ b/net/url_request/url_request_context_builder.cc
@@ -210,8 +210,7 @@ URLRequestContextBuilder::URLRequestContextBuilder()
       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() {}
@@ -236,6 +235,11 @@ void URLRequestContextBuilder::SetHttpNetworkSessionComponents(
   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) {
@@ -424,11 +428,6 @@ std::unique_ptr<URLRequestContext> URLRequestContextBuilder::Build() {
     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));