Added Network Quality Estimator Real-time interface to Cronet

components/cronet/android/cronet_url_request_context_adapter.cc

 // 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.
 
 #include "components/cronet/android/cronet_url_request_context_adapter.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/bind.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_file.h"
 #include "base/logging.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/prefs/pref_filter.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/pref_service_factory.h"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "components/cronet/url_request_context_config.h"
 #include "jni/CronetUrlRequestContext_jni.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/base/network_delegate_impl.h"
+#include "net/base/network_quality_estimator.h"
 #include "net/http/http_auth_handler_factory.h"
 #include "net/http/http_server_properties_manager.h"
 #include "net/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
 #include "net/sdch/sdch_owner.h"
 #include "net/url_request/url_request_context.h"
 #include "net/url_request/url_request_context_builder.h"
 #include "net/url_request/url_request_interceptor.h"
 
 #if defined(DATA_REDUCTION_PROXY_SUPPORT)
@@ skipping 95 matching lines @@
   network_thread_->StartWithOptions(options);
 }
 
 CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
 
   if (http_server_properties_manager_)
     http_server_properties_manager_->ShutdownOnPrefThread();
   if (pref_service_)
     pref_service_->CommitPendingWrite();
+  network_quality_estimator_->RemoveRTTObserver(this);

[mef, 2015/08/26 16:58:59]

what if network_quality_estimator_ is null?

[bengr, 2015/08/27 16:44:34]

Uggh. I wrote all of this when that wasn't possible. Fixed.

+  network_quality_estimator_->RemoveThroughputObserver(this);
   StopNetLogOnNetworkThread();
 }
 
 void CronetURLRequestContextAdapter::InitRequestContextOnMainThread(
     JNIEnv* env,
     jobject jcaller) {
   base::android::ScopedJavaGlobalRef<jobject> jcaller_ref;
   jcaller_ref.Reset(env, jcaller);
   proxy_config_service_.reset(net::ProxyService::CreateSystemProxyConfigService(
       GetNetworkTaskRunner(), nullptr));
   GetNetworkTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&CronetURLRequestContextAdapter::InitializeOnNetworkThread,
                  base::Unretained(this), Passed(&context_config_),
                  jcaller_ref));
 }
 
+void CronetURLRequestContextAdapter::
+    EnableNetworkQualityEstimatorOnNetworkThread(bool use_local_host_requests,
+                                                 bool use_smaller_responses) {
+  DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
+  scoped_ptr<net::ExternalEstimateProvider> external_estimate_provider;

[mef, 2015/08/26 16:58:59]

uninitialized?

[mef, 2015/08/26 17:28:40]

include header for net::ExternalEstimateProvider?

[bengr, 2015/08/27 16:44:34]

Done.

[bengr, 2015/08/27 16:44:34]

Done.

+  std::map<std::string, std::string> network_quality_estimator_params;

[mef, 2015/08/26 16:58:59]

#include <map>

[bengr, 2015/08/27 16:44:34]

Done.

+  network_quality_estimator_.reset(new net::NetworkQualityEstimator(
+      external_estimate_provider.Pass(), network_quality_estimator_params));
+  context_->set_network_quality_estimator(network_quality_estimator_.get());
+  network_quality_estimator_->Configure(use_local_host_requests,
+                                        use_smaller_responses);
+}
+
+void CronetURLRequestContextAdapter::EnableNetworkQualityEstimator(
+    JNIEnv* env,
+    jobject jcaller,
+    jboolean use_local_host_requests,
+    jboolean use_smaller_responses) {
+  PostTaskToNetworkThread(
+      FROM_HERE, base::Bind(&CronetURLRequestContextAdapter::
+                                EnableNetworkQualityEstimatorOnNetworkThread,
+                            base::Unretained(this), use_local_host_requests,
+                            use_smaller_responses));
+}
+
+void CronetURLRequestContextAdapter::ProvideRTTObservationsOnNetworkThread(
+    bool should) {
+  if (should)
+    network_quality_estimator_->AddRTTObserver(this);

[mef, 2015/08/26 16:58:59]

is there any danger in doing it multiple times?

[bengr, 2015/08/27 16:44:34]

Nope. No issue. The observer will only be added once and removed once.

+  else
+    network_quality_estimator_->RemoveRTTObserver(this);
+}
+
+void CronetURLRequestContextAdapter::ProvideRTTObservations(JNIEnv* env,
+                                                            jobject jcaller,
+                                                            bool should) {
+  PostTaskToNetworkThread(FROM_HERE,
+                          base::Bind(&CronetURLRequestContextAdapter::
+                                         ProvideRTTObservationsOnNetworkThread,
+                                     base::Unretained(this), should));
+}
+
+void CronetURLRequestContextAdapter::
+    ProvideThroughputObservationsOnNetworkThread(bool should) {
+  if (should)
+    network_quality_estimator_->AddThroughputObserver(this);
+  else
+    network_quality_estimator_->RemoveThroughputObserver(this);
+}
+
+void CronetURLRequestContextAdapter::ProvideThroughputObservations(
+    JNIEnv* env,
+    jobject jcaller,
+    bool should) {
+  PostTaskToNetworkThread(
+      FROM_HERE, base::Bind(&CronetURLRequestContextAdapter::
+                                ProvideThroughputObservationsOnNetworkThread,
+                            base::Unretained(this), should));
+}
+
 void CronetURLRequestContextAdapter::InitializeOnNetworkThread(
     scoped_ptr<URLRequestContextConfig> config,
     const base::android::ScopedJavaGlobalRef<jobject>&
         jcronet_url_request_context) {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   DCHECK(!is_context_initialized_);
   DCHECK(proxy_config_service_);
   // TODO(mmenke):  Add method to have the builder enable SPDY.
   net::URLRequestContextBuilder context_builder;
 
@@ skipping 105 matching lines @@
       net::AlternativeService alternative_service(
           net::AlternateProtocol::QUIC, "",
           static_cast<uint16>(quic_hint.alternate_port));
       context_->http_server_properties()->SetAlternativeService(
           quic_hint_host_port_pair, alternative_service, 1.0f,
           base::Time::Max());
     }
   }
 
   JNIEnv* env = base::android::AttachCurrentThread();
+  jcronet_url_request_context_.Reset(env, jcronet_url_request_context.obj());
   Java_CronetUrlRequestContext_initNetworkThread(
       env, jcronet_url_request_context.obj());
 
 #if defined(DATA_REDUCTION_PROXY_SUPPORT)
   if (data_reduction_proxy_)
     data_reduction_proxy_->Init(true, GetURLRequestContext());
 #endif
   is_context_initialized_ = true;
   while (!tasks_waiting_for_context_.empty()) {
     tasks_waiting_for_context_.front().Run();
@@ skipping 98 matching lines @@
 
 base::Thread* CronetURLRequestContextAdapter::GetFileThread() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
   if (!file_thread_) {
     file_thread_.reset(new base::Thread("Network File Thread"));
     file_thread_->Start();
   }
   return file_thread_.get();
 }
 
+void CronetURLRequestContextAdapter::OnRTTObservation(
+    int32_t rtt_ms,
+    const base::TimeTicks& timestamp,
+    net::NetworkQualityEstimator::ObservationSource source) {
+  Java_CronetUrlRequestContext_onRTTObservation(
+      base::android::AttachCurrentThread(), jcronet_url_request_context_.obj(),
+      rtt_ms, (timestamp - base::TimeTicks::UnixEpoch()).InMilliseconds(),
+      static_cast<jint>(source));
+}
+
+void CronetURLRequestContextAdapter::OnThroughputObservation(
+    int32_t throughput_kbps,
+    const base::TimeTicks& timestamp,
+    net::NetworkQualityEstimator::ObservationSource source) {
+  Java_CronetUrlRequestContext_onThroughputObservation(
+      base::android::AttachCurrentThread(), jcronet_url_request_context_.obj(),
+      throughput_kbps,
+      (timestamp - base::TimeTicks::UnixEpoch()).InMilliseconds(),
+      static_cast<jint>(source));
+}
+
 // Creates RequestContextAdater if config is valid URLRequestContextConfig,
 // returns 0 otherwise.
 static jlong CreateRequestContextAdapter(JNIEnv* env,
                                          jclass jcaller,
                                          jstring jconfig) {
   std::string config_string =
       base::android::ConvertJavaStringToUTF8(env, jconfig);
   scoped_ptr<URLRequestContextConfig> context_config(
       new URLRequestContextConfig());
   if (!context_config->LoadFromJSON(config_string))
     return 0;
 
   CronetURLRequestContextAdapter* context_adapter =
       new CronetURLRequestContextAdapter(context_config.Pass());
   return reinterpret_cast<jlong>(context_adapter);
 }
 
 static jint SetMinLogLevel(JNIEnv* env, jclass jcaller, jint jlog_level) {
   jint old_log_level = static_cast<jint>(logging::GetMinLogLevel());
   // MinLogLevel is global, shared by all URLRequestContexts.
   logging::SetMinLogLevel(static_cast<int>(jlog_level));
   return old_log_level;
 }
 
 }  // namespace cronet