diff options
Diffstat (limited to 'components/cronet')
5 files changed, 13 insertions, 14 deletions
diff --git a/components/cronet/DEPS b/components/cronet/DEPS index bd43afc..413c4b4 100644 --- a/components/cronet/DEPS +++ b/components/cronet/DEPS @@ -1,5 +1,4 @@ include_rules = [ "+components/metrics", - "+components/prefs", "+net", ] diff --git a/components/cronet/android/cronet_data_reduction_proxy.cc b/components/cronet/android/cronet_data_reduction_proxy.cc index 360862fb..0b6bf02 100644 --- a/components/cronet/android/cronet_data_reduction_proxy.cc +++ b/components/cronet/android/cronet_data_reduction_proxy.cc @@ -8,6 +8,9 @@ #include "base/command_line.h" #include "base/logging.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 "components/cronet/android/cronet_in_memory_pref_store.h" #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h" @@ -20,9 +23,6 @@ #include "components/data_reduction_proxy/core/browser/data_store.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_params.h" #include "components/data_reduction_proxy/core/common/data_reduction_proxy_switches.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/pref_service_factory.h" #include "net/url_request/url_request_context_getter.h" #include "net/url_request/url_request_interceptor.h" @@ -36,7 +36,7 @@ scoped_ptr<PrefService> CreatePrefService() { scoped_refptr<PrefRegistrySimple> pref_registry(new PrefRegistrySimple()); pref_registry->RegisterBooleanPref(kDataReductionProxyEnabled, false); data_reduction_proxy::RegisterSimpleProfilePrefs(pref_registry.get()); - PrefServiceFactory pref_service_factory; + base::PrefServiceFactory pref_service_factory; pref_service_factory.set_user_prefs( make_scoped_refptr(new CronetInMemoryPrefStore())); scoped_ptr<PrefService> pref_service = diff --git a/components/cronet/android/cronet_in_memory_pref_store.h b/components/cronet/android/cronet_in_memory_pref_store.h index a9d86ef..1aede14 100644 --- a/components/cronet/android/cronet_in_memory_pref_store.h +++ b/components/cronet/android/cronet_in_memory_pref_store.h @@ -13,8 +13,8 @@ #include "base/macros.h" #include "base/memory/scoped_ptr.h" #include "base/observer_list.h" -#include "components/prefs/persistent_pref_store.h" -#include "components/prefs/pref_value_map.h" +#include "base/prefs/persistent_pref_store.h" +#include "base/prefs/pref_value_map.h" namespace base { class Value; diff --git a/components/cronet/android/cronet_url_request_context_adapter.cc b/components/cronet/android/cronet_url_request_context_adapter.cc index 49ba22a..a8fe96d 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.cc +++ b/components/cronet/android/cronet_url_request_context_adapter.cc @@ -21,16 +21,16 @@ #include "base/memory/scoped_vector.h" #include "base/message_loop/message_loop.h" #include "base/metrics/statistics_recorder.h" +#include "base/prefs/pref_change_registrar.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/histogram_manager.h" #include "components/cronet/url_request_context_config.h" -#include "components/prefs/pref_change_registrar.h" -#include "components/prefs/pref_filter.h" -#include "components/prefs/pref_registry_simple.h" -#include "components/prefs/pref_service.h" -#include "components/prefs/pref_service_factory.h" #include "jni/CronetUrlRequestContext_jni.h" #include "net/base/external_estimate_provider.h" #include "net/base/load_flags.h" @@ -443,7 +443,7 @@ void CronetURLRequestContextAdapter::InitializeOnNetworkThread( context_builder.SetFileTaskRunner(GetFileThread()->task_runner()); // Set up HttpServerPropertiesManager. - PrefServiceFactory factory; + base::PrefServiceFactory factory; factory.set_user_prefs(json_pref_store_); scoped_refptr<PrefRegistrySimple> registry(new PrefRegistrySimple()); registry->RegisterDictionaryPref(kHttpServerProperties, diff --git a/components/cronet/android/cronet_url_request_context_adapter.h b/components/cronet/android/cronet_url_request_context_adapter.h index 81c07dd..851dc75 100644 --- a/components/cronet/android/cronet_url_request_context_adapter.h +++ b/components/cronet/android/cronet_url_request_context_adapter.h @@ -16,8 +16,8 @@ #include "base/macros.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +#include "base/prefs/json_pref_store.h" #include "base/threading/thread.h" -#include "components/prefs/json_pref_store.h" #include "net/base/network_quality_estimator.h" class PrefService; |