Make NQE a derived class of NetworkQualityProvider

components/offline_pages/core/background/network_quality_provider_stub.h

Index: components/offline_pages/core/background/network_quality_provider_stub.h
diff --git a/components/offline_pages/core/background/network_quality_provider_stub.h b/components/offline_pages/core/background/network_quality_provider_stub.h
index 54923f02392c1bf6e8c962e03530554c3cb3cb80..b6341b94f4e2659d6fef29ac398b8208a0b04d73 100644
--- a/components/offline_pages/core/background/network_quality_provider_stub.h
+++ b/components/offline_pages/core/background/network_quality_provider_stub.h
@@ -7,15 +7,14 @@
 
 #include "base/supports_user_data.h"
 #include "net/nqe/effective_connection_type.h"
-#include "net/nqe/network_quality_estimator.h"
+#include "net/nqe/network_quality_provider.h"
 
 namespace offline_pages {
 
 // Test class stubbing out the functionality of NQE::NetworkQualityProvider.
 // It is only used for test support.
-class NetworkQualityProviderStub
-    : public net::NetworkQualityEstimator::NetworkQualityProvider,
-      public base::SupportsUserData::Data {
+class NetworkQualityProviderStub : public net::NetworkQualityProvider,
+                                   public base::SupportsUserData::Data {
  public:
   NetworkQualityProviderStub();
   ~NetworkQualityProviderStub() override;
@@ -27,22 +26,6 @@ class NetworkQualityProviderStub
 
   net::EffectiveConnectionType GetEffectiveConnectionType() const override;
 
-  void AddEffectiveConnectionTypeObserver(
-      net::NetworkQualityEstimator::EffectiveConnectionTypeObserver* observer)
-      override;
-
-  void RemoveEffectiveConnectionTypeObserver(
-      net::NetworkQualityEstimator::EffectiveConnectionTypeObserver* observer)
-      override;
-
-  void AddRTTAndThroughputEstimatesObserver(
-      net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver* observer)
-      override;
-
-  void RemoveRTTAndThroughputEstimatesObserver(
-      net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver* observer)
-      override;
-
   void SetEffectiveConnectionTypeForTest(net::EffectiveConnectionType type) {
     connection_type_ = type;
   }