Make NQE a derived class of NetworkQualityProvider

chrome/browser/net/nqe/ui_network_quality_estimator_service_browsertest.cc

 // Copyright 2016 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 <map>
 #include <string>
 
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "base/test/histogram_tester.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/io_thread.h"
 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service.h"
 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service_factory.h"
 #include "chrome/browser/net/nqe/ui_network_quality_estimator_service_test_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/variations/variations_associated_data.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/browser_test.h"
 #include "net/base/network_change_notifier.h"
 #include "net/nqe/cached_network_quality.h"
 #include "net/nqe/effective_connection_type.h"
+#include "net/nqe/effective_connection_type_observer.h"
 #include "net/nqe/network_id.h"
 #include "net/nqe/network_quality_estimator.h"
+#include "net/nqe/rtt_throughput_estimates_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 class Profile;
 
 namespace {
 
 class TestEffectiveConnectionTypeObserver
-    : public net::NetworkQualityEstimator::EffectiveConnectionTypeObserver {
+    : public net::EffectiveConnectionTypeObserver {
  public:
   TestEffectiveConnectionTypeObserver()
       : effective_connection_type_(net::EFFECTIVE_CONNECTION_TYPE_UNKNOWN) {}
   ~TestEffectiveConnectionTypeObserver() override {}
 
-  // net::NetworkQualityEstimator::EffectiveConnectionTypeObserver
-  // implementation:
+  // net::EffectiveConnectionTypeObserver implementation:
   void OnEffectiveConnectionTypeChanged(
       net::EffectiveConnectionType type) override {
     effective_connection_type_ = type;
   }
 
   // The most recently set EffectiveConnectionType.
   net::EffectiveConnectionType effective_connection_type() const {
     return effective_connection_type_;
   }
 
  private:
   net::EffectiveConnectionType effective_connection_type_;
 
   DISALLOW_COPY_AND_ASSIGN(TestEffectiveConnectionTypeObserver);
 };
 
 class TestRTTAndThroughputEstimatesObserver
-    : public net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver {
+    : public net::RTTAndThroughputEstimatesObserver {
  public:
   TestRTTAndThroughputEstimatesObserver()
       : http_rtt_(base::TimeDelta::FromMilliseconds(-1)),
         transport_rtt_(base::TimeDelta::FromMilliseconds(-1)),
         downstream_throughput_kbps_(-1) {}
   ~TestRTTAndThroughputEstimatesObserver() override {}
 
-  // net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver
-  // implementation:
+  // net::RTTAndThroughputEstimatesObserver implementation:
   void OnRTTOrThroughputEstimatesComputed(
       base::TimeDelta http_rtt,
       base::TimeDelta transport_rtt,
       int32_t downstream_throughput_kbps) override {
     http_rtt_ = http_rtt;
     transport_rtt_ = transport_rtt;
     downstream_throughput_kbps_ = downstream_throughput_kbps;
   }
 
   base::TimeDelta http_rtt() const { return http_rtt_; }
@@ skipping 216 matching lines @@
   nqe_service->RemoveRTTAndThroughputEstimatesObserver(&nqe_observer_3);
   base::RunLoop().RunUntilIdle();
   EXPECT_GT(0, nqe_observer_3.http_rtt().InMilliseconds());
 }
 
 // Verify that prefs are writen and read correctly.
 IN_PROC_BROWSER_TEST_F(UINetworkQualityEstimatorServiceBrowserTest,
                        WritingReadingToPrefsEnabled) {
   VerifyWritingReadingPrefs();
 }