Make NQE a derived class of NetworkQualityProvider

content/browser/net/network_quality_observer_impl.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 "content/browser/net/network_quality_observer_impl.h"
 
 #include "base/memory/ptr_util.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
+#include "net/nqe/network_quality_estimator.h"
 
 namespace {
 
 // Returns true if the |current_value| is meaningfully different from the
 // |past_value|.
 bool MetricChangedMeaningfully(int32_t past_value, int32_t current_value) {
   if ((past_value == net::nqe::internal::INVALID_RTT_THROUGHPUT) !=
       (current_value == net::nqe::internal::INVALID_RTT_THROUGHPUT)) {
     return true;
   }
@@ skipping 180 matching lines @@
   last_notified_network_quality_ = net::nqe::internal::NetworkQuality(
       http_rtt, transport_rtt, downstream_throughput_kbps);
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       base::BindOnce(&UiThreadObserver::OnRTTOrThroughputEstimatesComputed,
                      base::Unretained(ui_thread_observer_.get()),
                      last_notified_network_quality_));
 }
 
-std::unique_ptr<net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver>
+std::unique_ptr<net::RTTAndThroughputEstimatesObserver>
 CreateNetworkQualityObserver(
     net::NetworkQualityEstimator* network_quality_estimator) {
   return base::MakeUnique<NetworkQualityObserverImpl>(
       network_quality_estimator);
 }
 
 }  // namespace content