Make NQE a derived class of NetworkQualityProvider

content/public/browser/network_quality_observer_factory.h

Index: content/public/browser/network_quality_observer_factory.h
diff --git a/content/public/browser/network_quality_observer_factory.h b/content/public/browser/network_quality_observer_factory.h
index b6102a0ba28edc5f0ad34bfaebe35a9acded93f3..37f8993b5cbd362268891b388ac36fe736283b54 100644
--- a/content/public/browser/network_quality_observer_factory.h
+++ b/content/public/browser/network_quality_observer_factory.h
@@ -13,13 +13,13 @@
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "net/nqe/network_quality_estimator.h"
+#include "net/nqe/rtt_throughput_estimates_observer.h"
 
 namespace content {
 
 // Creates network quality observer that listens for changes to the network
 // quality and manages sending updates to each RenderProcess.
-CONTENT_EXPORT std::unique_ptr<
-    net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver>
+CONTENT_EXPORT std::unique_ptr<net::RTTAndThroughputEstimatesObserver>
 CreateNetworkQualityObserver(
     net::NetworkQualityEstimator* network_quality_estimator);