Revert of Add a NetworkQualityEstimator to TestURLRequestContext.

net/url_request/url_request_test_util.cc

Index: net/url_request/url_request_test_util.cc
diff --git a/net/url_request/url_request_test_util.cc b/net/url_request/url_request_test_util.cc
index 336514659c59a64686171307d63c9cfb030992b9..cc56ef300f17749a68d8e34a8ad93fb986611921 100644
--- a/net/url_request/url_request_test_util.cc
+++ b/net/url_request/url_request_test_util.cc
@@ -4,8 +4,6 @@
 
 #include "net/url_request/url_request_test_util.h"
 
-#include <map>
-#include <string>
 #include <utility>
 
 #include "base/compiler_specific.h"
@@ -26,7 +24,6 @@
 #include "net/http/http_response_headers.h"
 #include "net/http/http_server_properties_impl.h"
 #include "net/http/transport_security_state.h"
-#include "net/nqe/external_estimate_provider.h"
 #include "net/proxy/proxy_retry_info.h"
 #include "net/ssl/channel_id_service.h"
 #include "net/ssl/default_channel_id_store.h"
@@ -60,9 +57,7 @@
 TestURLRequestContext::TestURLRequestContext() : TestURLRequestContext(false) {}
 
 TestURLRequestContext::TestURLRequestContext(bool delay_initialization)
-    : network_quality_estimator_(std::unique_ptr<ExternalEstimateProvider>(),
-                                 std::map<std::string, std::string>()),
-      context_storage_(this) {
+    : context_storage_(this) {
   if (!delay_initialization)
     Init();
 }
@@ -117,10 +112,6 @@
         new DefaultChannelIDStore(nullptr),
         base::WorkerPool::GetTaskRunner(true)));
   }
-
-  if (!network_quality_estimator())
-    set_network_quality_estimator(&network_quality_estimator_);
-
   if (http_transaction_factory()) {
     // Make sure we haven't been passed an object we're not going to use.
     EXPECT_FALSE(client_socket_factory_);
@@ -142,8 +133,6 @@
     params.http_server_properties = http_server_properties();
     params.net_log = net_log();
     params.channel_id_service = channel_id_service();
-    params.socket_performance_watcher_factory =
-        network_quality_estimator()->GetSocketPerformanceWatcherFactory();
     context_storage_.set_http_network_session(
         base::MakeUnique<HttpNetworkSession>(params));
     context_storage_.set_http_transaction_factory(base::MakeUnique<HttpCache>(