Revert of Delete base/prefs and update callers to use components.

components/cronet/android/cronet_data_reduction_proxy.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 "components/cronet/android/cronet_data_reduction_proxy.h"
 
 #include <utility>
 
 #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"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_network_delegate.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_prefs.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_request_options.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_service.h"
 #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_settings.h"
 #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"
 
 namespace cronet {
 namespace {
 
 // Name of the preference that governs enabling the Data Reduction Proxy.
 const char kDataReductionProxyEnabled[] = "data_reduction_proxy.enabled";
 
 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 =
       pref_service_factory.Create(pref_registry.get());
   pref_registry = nullptr;
   return pref_service;
 }
 
 // TODO(bengr): Apply test configurations directly, instead of via the
 // command line.
@@ skipping 76 matching lines @@
   io_data_->SetDataReductionProxyService(
       data_reduction_proxy_service->GetWeakPtr());
   settings_->InitDataReductionProxySettings(
       kDataReductionProxyEnabled, prefs_.get(), io_data_.get(),
       std::move(data_reduction_proxy_service));
   settings_->SetDataReductionProxyEnabled(enable);
   settings_->MaybeActivateDataReductionProxy(true);
 }
 
 }  // namespace cronet