Make NQE a derived class of NetworkQualityProvider

chrome/browser/io_thread.h

 // 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.
 
 #ifndef CHROME_BROWSER_IO_THREAD_H_
 #define CHROME_BROWSER_IO_THREAD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 65 matching lines @@
 
 namespace net {
 class CertVerifier;
 class CTLogVerifier;
 class HostMappingRules;
 class HostResolver;
 class HttpAuthPreferences;
 class LoggingNetworkChangeObserver;
 class NetworkQualityEstimator;
 class ProxyConfigService;
+class RTTAndThroughputEstimatesObserver;
 class SSLConfigService;
 class URLRequestContext;
 class URLRequestContextGetter;
 class URLRequestContextStorage;
 
 namespace ct {
 class STHObserver;
 }
 
 }  // namespace net
@@ skipping 51 matching lines @@
     std::unique_ptr<net::URLRequestContextStorage>
         system_request_context_storage;
     std::unique_ptr<net::URLRequestContext> system_request_context;
     SystemRequestContextLeakChecker system_request_context_leak_checker;
 #if BUILDFLAG(ENABLE_EXTENSIONS)
     scoped_refptr<extensions::EventRouterForwarder>
         extension_event_router_forwarder;
 #endif
     std::unique_ptr<net::HostMappingRules> host_mapping_rules;
     std::unique_ptr<net::NetworkQualityEstimator> network_quality_estimator;
-    std::unique_ptr<
-        net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver>
+    std::unique_ptr<net::RTTAndThroughputEstimatesObserver>
         network_quality_observer;
 
     // NetErrorTabHelper uses |dns_probe_service| to send DNS probes when a
     // main frame load fails with a DNS error in order to provide more useful
     // information to the renderer so it can show a more specific error page.
     std::unique_ptr<chrome_browser_net::DnsProbeService> dns_probe_service;
 
     // Enables Brotli Content-Encoding support
     bool enable_brotli;
   };
@@ skipping 181 matching lines @@
   bool http_09_on_non_default_ports_enabled_;
 
   const base::TimeTicks creation_time_;
 
   base::WeakPtrFactory<IOThread> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };
 
 #endif  // CHROME_BROWSER_IO_THREAD_H_