[Cronet] Set up HttpServerPropertiesManager

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/thread_task_runner_handle.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/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)
 #include "components/cronet/android/cronet_data_reduction_proxy.h"
 #endif
 
 namespace {
 
+const char kHttpServerProperties[] = "net.http_server_properties";
+
 class BasicNetworkDelegate : public net::NetworkDelegateImpl {
  public:
   BasicNetworkDelegate() {}
   ~BasicNetworkDelegate() override {}
 
  private:
   // net::NetworkDelegate implementation.
   int OnBeforeURLRequest(net::URLRequest* request,
                          const net::CompletionCallback& callback,
                          GURL* new_url) override {
@@ skipping 75 matching lines @@
       context_config_(context_config.Pass()),
       is_context_initialized_(false),
       default_load_flags_(net::LOAD_NORMAL) {
   base::Thread::Options options;
   options.message_loop_type = base::MessageLoop::TYPE_IO;
   network_thread_->StartWithOptions(options);
 }
 
 CronetURLRequestContextAdapter::~CronetURLRequestContextAdapter() {
   DCHECK(GetNetworkTaskRunner()->BelongsToCurrentThread());
+
+  if (http_server_prperties_manager_)
+    http_server_properties_manager_->ShutdownOnPrefThread();
+  if (pref_service_)
+    pref_service_->CommitPendingWrite();
   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));
@@ skipping 36 matching lines @@
     interceptors.push_back(data_reduction_proxy_->CreateInterceptor());
     context_builder.SetInterceptors(interceptors.Pass());
   }
 #endif  // defined(DATA_REDUCTION_PROXY_SUPPORT)
   context_builder.set_network_delegate(network_delegate.release());
   context_builder.set_net_log(net_log.release());
   context_builder.set_proxy_config_service(proxy_config_service_.release());
   config->ConfigureURLRequestContextBuilder(&context_builder);
 
   // Set up pref file if storage path is specified.
-  // TODO(xunjieli): maybe get rid of the condition on sdch.
-  if (!config->storage_path.empty() && config->enable_sdch) {
+  if (!config->storage_path.empty()) {
     base::FilePath filepath(config->storage_path);
     filepath = filepath.Append(FILE_PATH_LITERAL("local_prefs.json"));
     json_pref_store_ = new JsonPrefStore(
         filepath, GetFileThread()->task_runner(), scoped_ptr<PrefFilter>());
-    json_pref_store_->ReadPrefsAsync(nullptr);
     context_builder.SetFileTaskRunner(GetFileThread()->task_runner());
+
+    // Set up HttpServerPropertiesManager.
+    base::PrefServiceFactory factory;
+    factory.set_user_prefs(json_pref_store_);
+    scoped_refptr<PrefRegistrySimple> registry = new PrefRegistrySimple;

[mmenke, 2015/07/09 19:08:10]

optional:  Suggest using:
scoped_refptr<PrefRegistrySimple> registry(...);

syntax instead (Just because that's what has to be done with scoped_ptrs, and I
like to delude myself into thinking they're more similar than they really are.

[xunjieli, 2015/07/09 19:37:01]

Done.

+    registry->RegisterDictionaryPref(kHttpServerProperties,
+                                     new base::DictionaryValue());
+    pref_service_ = factory.Create(registry.get()).Pass();
+
+    http_server_properties_manager_ = new net::HttpServerPropertiesManager(
+        pref_service_.get(), kHttpServerProperties,
+        base::ThreadTaskRunnerHandle::Get());

[mmenke, 2015/07/09 19:08:10]

Should either use GetNetworkTaskRunner() instead of
base::ThreadTaskRunnerHandle::Get(), or modify the CronetDataReductionProxy
constructor call to use base::ThreadTaskRunnerHandle::Get().  I don't have
strong feelings on the subject - GetNetworkTaskRunner() emphasizes it uses the
network thread, while ThreadTaskRunnerHandle::Get() emphasizes it uses the
current thread.

[mmenke, 2015/07/09 19:08:10]

I'd suggest this:

scoped_ptr<net::HttpServerPropertiesManager> http_properties_manager(new ...);
http_server_properties_manager->InitializeOnNetworkThread();
http_server_properties_manager_ = http_server_properties_manager.get();
context_builder.SetHttpServerProperties(http_server_properties_manager.get());

Keeping something in a scoped_ptr is a bit more robust if error cases are added
or something, and just ownership semantics a bit clearer .

[xunjieli, 2015/07/09 19:37:02]

Done.

[xunjieli, 2015/07/09 19:37:02]

Done.

+    http_server_properties_manager_->InitializeOnNetworkThread();
+    context_builder.SetHttpServerProperties(
+        make_scoped_ptr(http_server_properties_manager_));
   }
 
   context_.reset(context_builder.Build());
 
   default_load_flags_ = net::LOAD_DO_NOT_SAVE_COOKIES |
                         net::LOAD_DO_NOT_SEND_COOKIES;
   if (config->load_disable_cache)
     default_load_flags_ |= net::LOAD_DISABLE_CACHE;
 
   if (config->enable_sdch) {
@@ skipping 185 matching lines @@
 }
 
 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