Revert "Populate EEP estimate in NQE"

chrome/browser/android/net/external_estimate_provider_android.cc

 // Copyright 2015 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/android/net/external_estimate_provider_android.h"
 
 #include <stdint.h>
 
 #include "base/message_loop/message_loop.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 15 matching lines @@
   DCHECK(!j_external_estimate_provider_.is_null());
   no_value_ = Java_ExternalEstimateProviderAndroid_getNoValue(env);
   net::NetworkChangeNotifier::AddConnectionTypeObserver(this);
 }
 
 ExternalEstimateProviderAndroid::~ExternalEstimateProviderAndroid() {
   DCHECK(thread_checker_.CalledOnValidThread());
   net::NetworkChangeNotifier::RemoveConnectionTypeObserver(this);
 }
 
+void ExternalEstimateProviderAndroid::RequestUpdate() const {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  JNIEnv* env = base::android::AttachCurrentThread();
+  Java_ExternalEstimateProviderAndroid_requestUpdate(
+      env, j_external_estimate_provider_.obj());
+}
+
 bool ExternalEstimateProviderAndroid::GetRTT(base::TimeDelta* rtt) const {
   DCHECK(thread_checker_.CalledOnValidThread());
   JNIEnv* env = base::android::AttachCurrentThread();
   int32_t milliseconds =
       Java_ExternalEstimateProviderAndroid_getRTTMilliseconds(
           env, j_external_estimate_provider_.obj());
   DCHECK(milliseconds >= no_value_);
   if (milliseconds == no_value_)
     return false;
   *rtt = base::TimeDelta::FromMilliseconds(milliseconds);
@@ skipping 36 matching lines @@
           env, j_external_estimate_provider_.obj());
   DCHECK(seconds >= no_value_);
   if (seconds == no_value_) {
     *time_since_last_update = base::TimeDelta::Max();
     return false;
   }
   *time_since_last_update = base::TimeDelta::FromMilliseconds(seconds);
   return true;
 }
 
-void ExternalEstimateProviderAndroid::SetUpdatedEstimateDelegate(
-    net::ExternalEstimateProvider::UpdatedEstimateDelegate* delegate) {
-  delegate_ = delegate;
-}
-
-void ExternalEstimateProviderAndroid::Update() const {
-  DCHECK(thread_checker_.CalledOnValidThread());
-  JNIEnv* env = base::android::AttachCurrentThread();
-  Java_ExternalEstimateProviderAndroid_requestUpdate(
-      env, j_external_estimate_provider_.obj());
-}
-
-void ExternalEstimateProviderAndroid::OnConnectionTypeChanged(
-    net::NetworkChangeNotifier::ConnectionType type) {
-  Update();
-}
-
 void ExternalEstimateProviderAndroid::
     NotifyExternalEstimateProviderAndroidUpdate(JNIEnv* env, jobject obj) {
   if (!task_runner_)
     return;
   task_runner_->PostTask(
       FROM_HERE,
       base::Bind(
           &ExternalEstimateProviderAndroid::NotifyUpdatedEstimateAvailable,
           weak_factory_.GetWeakPtr()));
 }
 
 void ExternalEstimateProviderAndroid::NotifyUpdatedEstimateAvailable() const {
   DCHECK(thread_checker_.CalledOnValidThread());
   if (delegate_)
     delegate_->OnUpdatedEstimateAvailable();
 }
 
+void ExternalEstimateProviderAndroid::OnConnectionTypeChanged(
+    net::NetworkChangeNotifier::ConnectionType type) {
+  RequestUpdate();
+}
+
 bool RegisterExternalEstimateProviderAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
+void ExternalEstimateProviderAndroid::SetUpdatedEstimateDelegate(
+    net::ExternalEstimateProvider::UpdatedEstimateDelegate* delegate) {
+  delegate_ = delegate;
+}
+
 }  // namespace android
 }  // namespace chrome