Make NQE a derived class of NetworkQualityProvider

content/browser/net/network_quality_observer_impl.h

Index: content/browser/net/network_quality_observer_impl.h
diff --git a/content/browser/net/network_quality_observer_impl.h b/content/browser/net/network_quality_observer_impl.h
index 915ec17260be76c855d2be022f753e3d4a69a97b..046e73443c5c3b1a5a899393e5e17bbaa9b1a2aa 100644
--- a/content/browser/net/network_quality_observer_impl.h
+++ b/content/browser/net/network_quality_observer_impl.h
@@ -14,16 +14,18 @@
 #include "content/common/content_export.h"
 #include "content/public/browser/network_quality_observer_factory.h"
 #include "net/nqe/effective_connection_type.h"
+#include "net/nqe/effective_connection_type_observer.h"
 #include "net/nqe/network_quality.h"
 #include "net/nqe/network_quality_estimator.h"
+#include "net/nqe/rtt_throughput_estimates_observer.h"
 
 namespace content {
 
 // Listens for changes to the network quality and manages sending updates to
 // each RenderProcess via mojo.
 class CONTENT_EXPORT NetworkQualityObserverImpl
-    : public net::NetworkQualityEstimator::EffectiveConnectionTypeObserver,
-      public net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver {
+    : public net::EffectiveConnectionTypeObserver,
+      public net::RTTAndThroughputEstimatesObserver {
  public:
   explicit NetworkQualityObserverImpl(
       net::NetworkQualityEstimator* network_quality_estimator);