Revert of Expose RTT and throughput estimates from Cronet

components/cronet/android/cronet_url_request_context_adapter.h

 // Copyright 2014 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.
 
 #ifndef COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
 #define COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_
 
 #include <jni.h>
 #include <stdint.h>
 
@@ skipping 34 matching lines @@
 class CronetDataReductionProxy;
 #endif
 
 struct URLRequestContextConfig;
 
 bool CronetUrlRequestContextAdapterRegisterJni(JNIEnv* env);
 
 // Adapter between Java CronetUrlRequestContext and net::URLRequestContext.
 class CronetURLRequestContextAdapter
     : public net::NetworkQualityEstimator::EffectiveConnectionTypeObserver,
-      public net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver,
       public net::NetworkQualityEstimator::RTTObserver,
       public net::NetworkQualityEstimator::ThroughputObserver {
  public:
   explicit CronetURLRequestContextAdapter(
       std::unique_ptr<URLRequestContextConfig> context_config);
 
   ~CronetURLRequestContextAdapter() override;
 
   // Called on main Java thread to initialize URLRequestContext.
   void InitRequestContextOnMainThread(
@@ skipping 94 matching lines @@
       bool use_smaller_responses);
 
   void ProvideRTTObservationsOnNetworkThread(bool should);
   void ProvideThroughputObservationsOnNetworkThread(bool should);
 
   // net::NetworkQualityEstimator::EffectiveConnectionTypeObserver
   // implementation.
   void OnEffectiveConnectionTypeChanged(
       net::EffectiveConnectionType effective_connection_type) override;
 
-  // net::NetworkQualityEstimator::RTTAndThroughputEstimatesObserver
-  // implementation.
-  void OnRTTOrThroughputEstimatesComputed(
-      base::TimeDelta http_rtt,
-      base::TimeDelta transport_rtt,
-      int32_t downstream_throughput_kbps) override;
-
   // net::NetworkQualityEstimator::RTTObserver implementation.
   void OnRTTObservation(int32_t rtt_ms,
                         const base::TimeTicks& timestamp,
                         net::NetworkQualityObservationSource source) override;
 
   // net::NetworkQualityEstimator::ThroughputObserver implementation.
   void OnThroughputObservation(
       int32_t throughput_kbps,
       const base::TimeTicks& timestamp,
       net::NetworkQualityObservationSource source) override;
@@ skipping 58 matching lines @@
 #if defined(DATA_REDUCTION_PROXY_SUPPORT)
   std::unique_ptr<CronetDataReductionProxy> data_reduction_proxy_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(CronetURLRequestContextAdapter);
 };
 
 }  // namespace cronet
 
 #endif  // COMPONENTS_CRONET_ANDROID_CRONET_URL_REQUEST_CONTEXT_ADAPTER_H_