Make NQE a derived class of NetworkQualityProvider

chrome/browser/page_load_metrics/observers/ukm_page_load_metrics_observer_unittest.cc

 // Copyright 2017 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.
 
 #include "chrome/browser/page_load_metrics/observers/ukm_page_load_metrics_observer.h"
 
 #include "base/memory/ptr_util.h"
 #include "base/metrics/metrics_hashes.h"
 #include "base/optional.h"
 #include "base/time/time.h"
 #include "chrome/browser/page_load_metrics/observers/page_load_metrics_observer_test_harness.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "components/ukm/test_ukm_recorder.h"
 #include "components/ukm/ukm_source.h"
+#include "net/nqe/effective_connection_type.h"
+#include "net/nqe/network_quality_provider.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using testing::AnyNumber;
 using testing::Mock;
 using testing::Return;
 
 namespace {
 
 const char kTestUrl1[] = "https://www.google.com/";
 const char kTestUrl2[] = "https://www.example.com/";
 
-class MockNetworkQualityProvider
-    : public net::NetworkQualityEstimator::NetworkQualityProvider {
+class MockNetworkQualityProvider : public net::NetworkQualityProvider {
  public:
   MOCK_CONST_METHOD0(GetEffectiveConnectionType,
                      net::EffectiveConnectionType());
   MOCK_CONST_METHOD0(GetHttpRTT, base::Optional<base::TimeDelta>());
   MOCK_CONST_METHOD0(GetTransportRTT, base::Optional<base::TimeDelta>());
-  MOCK_METHOD1(
-      AddEffectiveConnectionTypeObserver,
-      void(net::NetworkQualityEstimator::EffectiveConnectionTypeObserver*));
-  MOCK_METHOD1(
-      RemoveEffectiveConnectionTypeObserver,
-      void(net::NetworkQualityEstimator::EffectiveConnectionTypeObserver*));
-  MOCK_METHOD1(
-      AddRTTAndThroughputEstimatesObserver,
-      void(net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver*));
-  MOCK_METHOD1(
-      RemoveRTTAndThroughputEstimatesObserver,
-      void(net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver*));
 };
 
 }  // namespace
 
 class UkmPageLoadMetricsObserverTest
     : public page_load_metrics::PageLoadMetricsObserverTestHarness {
  protected:
   void RegisterObservers(page_load_metrics::PageLoadTracker* tracker) override {
     tracker->AddObserver(base::MakeUnique<UkmPageLoadMetricsObserver>(
         &mock_network_quality_provider_));
@@ skipping 305 matching lines @@
 
   EXPECT_GE(ukm_entry_count(), 1ul);
   ukm::mojom::UkmEntryPtr entry = GetMergedEntryForSourceID(source->id());
   EXPECT_EQ(entry->source_id, source->id());
   EXPECT_EQ(entry->event_hash,
             base::HashMetricName(internal::kUkmPageLoadEventName));
   EXPECT_FALSE(entry->metrics.empty());
   ExpectMetric(internal::kUkmPageTransition, ui::PAGE_TRANSITION_RELOAD,
                entry.get());
 }