[Cronet] Enable persistence mode for Sdch

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/prefs/pref_filter.h"
 #include "base/single_thread_task_runner.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/log/write_to_file_net_log_observer.h"
 #include "net/proxy/proxy_service.h"
@@ skipping 154 matching lines @@
         data_reduction_proxy_->CreateNetworkDelegate(network_delegate.Pass());
     ScopedVector<net::URLRequestInterceptor> interceptors;
     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.
+  if (!config->storage_path.empty()) {

[mmenke, 2015/05/26 19:34:40]

Suggest checking if sdch is enabled...Could get ugly if we start using it for my
things, but we can burn that bridge when we come to it.

[xunjieli, 2015/05/26 20:28:28]

Done. I know HttpServerProperties will use the same file. Matt, are you working
on another feature that also uses persistent pref file?

[mmenke, 2015/05/27 14:40:43]

That was a type...my == many (For some reason, a disproportionate number of my
typos end up as valid English words...Just the wrong English words).

[mmenke, 2015/05/27 14:41:31]

type == typo (Case in point...)

+    base::FilePath filepath(config->storage_path);
+    filepath = filepath.Append(FILE_PATH_LITERAL("local_prefs.json"));
+    if (!file_thread_) {

[mmenke, 2015/05/26 19:34:40]

Suggest a method GetFileThread, which creates it if needed, so we don't end up
with multiple copies of this logic.

[xunjieli, 2015/05/26 20:28:28]

Done.

+      file_thread_.reset(new base::Thread("Network File Thread"));
+      file_thread_->Start();
+    }
+    json_pref_store_ = new JsonPrefStore(filepath, file_thread_->task_runner(),
+                                         scoped_ptr<PrefFilter>());
+    json_pref_store_->ReadPrefsAsync(nullptr);
+    context_builder.SetFileTaskRunner(file_thread_->task_runner());
+  }
+
   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) {
     DCHECK(context_->sdch_manager());
     sdch_owner_.reset(
         new net::SdchOwner(context_->sdch_manager(), context_.get()));
+    if (json_pref_store_)
+      sdch_owner_->EnablePersistentStorage(json_pref_store_.get());
   }
 
   // Currently (circa M39) enabling QUIC requires setting probability threshold.
   if (config->enable_quic) {
     context_->http_server_properties()
         ->SetAlternativeServiceProbabilityThreshold(0.0f);
     for (auto hint = config->quic_hints.begin();
          hint != config->quic_hints.end(); ++hint) {
       const URLRequestContextConfig::QuicHint& quic_hint = **hint;
       if (quic_hint.host.empty()) {
@@ skipping 161 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