1 files changed, 19 insertions, 17 deletions
diff --git a/net/url_request/url_request_context.cc b/net/url_request/url_request_context.cc
index eb6a35c..bf299b7 100644
--- a/net/url_request/url_request_context.cc
+++ b/net/url_request/url_request_context.cc
@@ -17,23 +17,24 @@
 namespace net {
 
 URLRequestContext::URLRequestContext()
-    : net_log_(NULL),
-      host_resolver_(NULL),
-      cert_verifier_(NULL),
-      channel_id_service_(NULL),
-      fraudulent_certificate_reporter_(NULL),
-      http_auth_handler_factory_(NULL),
-      proxy_service_(NULL),
-      network_delegate_(NULL),
-      http_user_agent_settings_(NULL),
-      transport_security_state_(NULL),
-      cert_transparency_verifier_(NULL),
-      http_transaction_factory_(NULL),
-      job_factory_(NULL),
-      throttler_manager_(NULL),
+    : net_log_(nullptr),
+      host_resolver_(nullptr),
+      cert_verifier_(nullptr),
+      channel_id_service_(nullptr),
+      fraudulent_certificate_reporter_(nullptr),
+      http_auth_handler_factory_(nullptr),
+      proxy_service_(nullptr),
+      network_delegate_(nullptr),
+      http_user_agent_settings_(nullptr),
+      transport_security_state_(nullptr),
+      cert_transparency_verifier_(nullptr),
+      http_transaction_factory_(nullptr),
+      job_factory_(nullptr),
+      throttler_manager_(nullptr),
       // For investigation of http://crbug.com/454198; restore when resolved.
-      // sdch_manager_(NULL),
+      // sdch_manager_(nullptr),
       have_sdch_manager_(false),
+      network_quality_estimator_(nullptr),
       url_requests_(new std::set<const URLRequest*>) {
 }
 
@@ -63,16 +64,17 @@ void URLRequestContext::CopyFrom(const URLRequestContext* other) {
   CHECK(!other->have_sdch_manager_ || other->sdch_manager_.get());
   set_sdch_manager(other->sdch_manager_.get());
   set_http_user_agent_settings(other->http_user_agent_settings_);
+  set_network_quality_estimator(other->network_quality_estimator_);
 }
 
 const HttpNetworkSession::Params* URLRequestContext::GetNetworkSessionParams(
     ) const {
   HttpTransactionFactory* transaction_factory = http_transaction_factory();
   if (!transaction_factory)
-    return NULL;
+    return nullptr;
   HttpNetworkSession* network_session = transaction_factory->GetSession();
   if (!network_session)
-    return NULL;
+    return nullptr;
   return &network_session->params();
 }