Make NQE a derived class of NetworkQualityProvider

content/browser/net/network_quality_observer_impl.cc

Index: content/browser/net/network_quality_observer_impl.cc
diff --git a/content/browser/net/network_quality_observer_impl.cc b/content/browser/net/network_quality_observer_impl.cc
index b7da9886f644ca259e3a9204ec223a0c5498c4fe..1d871bc782bdb34858eb38c4572139673ac77232 100644
--- a/content/browser/net/network_quality_observer_impl.cc
+++ b/content/browser/net/network_quality_observer_impl.cc
@@ -13,6 +13,7 @@
 #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 {
 
@@ -213,7 +214,7 @@ void NetworkQualityObserverImpl::OnRTTOrThroughputEstimatesComputed(
                      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>(