Remove PrefServiceBase, since everyone can now depend directly on PrefService.

TBR=ben@chromium.org
BUG=155525


Review URL: https://chromiumcodereview.appspot.com/12252008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@182918 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 31 insertions, 30 deletions

diff --git a/chromeos/chromeos.gyp b/chromeos/chromeos.gyp
index 54d5db1..d094a23 100644
--- a/chromeos/chromeos.gyp
+++ b/chromeos/chromeos.gyp
@@ -15,6 +15,7 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
+        '../base/base.gyp:base_prefs',
         '../build/linux/system.gyp:dbus',
         '../build/linux/system.gyp:ssl',
         '../dbus/dbus.gyp:dbus',
diff --git a/chromeos/dbus/power_policy_controller.cc b/chromeos/dbus/power_policy_controller.cc
index b7683e4..9968dec 100644
--- a/chromeos/dbus/power_policy_controller.cc
+++ b/chromeos/dbus/power_policy_controller.cc
@@ -12,7 +12,7 @@ namespace chromeos {
 
 namespace {
 
-// If |pref|, a PrefServiceBase::Preference containing an integer, has been
+// If |pref|, a PrefService::Preference containing an integer, has been
 // explicitly set to 0 or a positive value, assigns it to |proto_field|, a
 // int32 field in |proto|, a google::protobuf::MessageLite*.
 #define SET_DELAY_FROM_PREF(pref, proto_field, proto)                          \
@@ -33,7 +33,7 @@ namespace {
       }                                                                        \
     }
 
-// If |pref|, a PrefServiceBase::Preference containing a bool, has been
+// If |pref|, a PrefService::Preference containing a bool, has been
 // set, assigns it to |proto_field|, a bool field in |proto|, a
 // google::protobuf::MessageLite*.
 #define SET_BOOL_FROM_PREF(pref, proto_field, proto)                           \
@@ -47,7 +47,7 @@ namespace {
 
 // Returns a zero or positive integer value from |pref|.  Returns -1 if the
 // pref is unset and logs an error if it's set to a negative value.
-int GetIntPrefValue(const PrefServiceBase::Preference& pref) {
+int GetIntPrefValue(const PrefService::Preference& pref) {
   if (pref.IsDefaultValue())
     return -1;
 
@@ -104,19 +104,19 @@ PowerPolicyController::~PowerPolicyController() {
 }
 
 void PowerPolicyController::UpdatePolicyFromPrefs(
-    const PrefServiceBase::Preference& ac_screen_dim_delay_ms_pref,
-    const PrefServiceBase::Preference& ac_screen_off_delay_ms_pref,
-    const PrefServiceBase::Preference& ac_screen_lock_delay_ms_pref,
-    const PrefServiceBase::Preference& ac_idle_delay_ms_pref,
-    const PrefServiceBase::Preference& battery_screen_dim_delay_ms_pref,
-    const PrefServiceBase::Preference& battery_screen_off_delay_ms_pref,
-    const PrefServiceBase::Preference& battery_screen_lock_delay_ms_pref,
-    const PrefServiceBase::Preference& battery_idle_delay_ms_pref,
-    const PrefServiceBase::Preference& idle_action_pref,
-    const PrefServiceBase::Preference& lid_closed_action_pref,
-    const PrefServiceBase::Preference& use_audio_activity_pref,
-    const PrefServiceBase::Preference& use_video_activity_pref,
-    const PrefServiceBase::Preference& presentation_idle_delay_factor_pref) {
+    const PrefService::Preference& ac_screen_dim_delay_ms_pref,
+    const PrefService::Preference& ac_screen_off_delay_ms_pref,
+    const PrefService::Preference& ac_screen_lock_delay_ms_pref,
+    const PrefService::Preference& ac_idle_delay_ms_pref,
+    const PrefService::Preference& battery_screen_dim_delay_ms_pref,
+    const PrefService::Preference& battery_screen_off_delay_ms_pref,
+    const PrefService::Preference& battery_screen_lock_delay_ms_pref,
+    const PrefService::Preference& battery_idle_delay_ms_pref,
+    const PrefService::Preference& idle_action_pref,
+    const PrefService::Preference& lid_closed_action_pref,
+    const PrefService::Preference& use_audio_activity_pref,
+    const PrefService::Preference& use_video_activity_pref,
+    const PrefService::Preference& presentation_idle_delay_factor_pref) {
   prefs_policy_.Clear();
 
   power_manager::PowerManagementPolicy::Delays* delays =
diff --git a/chromeos/dbus/power_policy_controller.h b/chromeos/dbus/power_policy_controller.h
index ca3ce0f..0039e34 100644
--- a/chromeos/dbus/power_policy_controller.h
+++ b/chromeos/dbus/power_policy_controller.h
@@ -7,7 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "base/prefs/public/pref_service_base.h"
+#include "base/prefs/pref_service.h"
 #include "chromeos/chromeos_export.h"
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/power_manager/policy.pb.h"
@@ -37,19 +37,19 @@ class CHROMEOS_EXPORT PowerPolicyController
   // Sends an updated policy to the power manager based on the current
   // values of the passed-in prefs.
   void UpdatePolicyFromPrefs(
-      const PrefServiceBase::Preference& ac_screen_dim_delay_ms_pref,
-      const PrefServiceBase::Preference& ac_screen_off_delay_ms_pref,
-      const PrefServiceBase::Preference& ac_screen_lock_delay_ms_pref,
-      const PrefServiceBase::Preference& ac_idle_delay_ms_pref,
-      const PrefServiceBase::Preference& battery_screen_dim_delay_ms_pref,
-      const PrefServiceBase::Preference& battery_screen_off_delay_ms_pref,
-      const PrefServiceBase::Preference& battery_screen_lock_delay_ms_pref,
-      const PrefServiceBase::Preference& battery_idle_delay_ms_pref,
-      const PrefServiceBase::Preference& idle_action_pref,
-      const PrefServiceBase::Preference& lid_closed_action_pref,
-      const PrefServiceBase::Preference& use_audio_activity_pref,
-      const PrefServiceBase::Preference& use_video_activity_pref,
-      const PrefServiceBase::Preference& presentation_idle_delay_factor_pref);
+      const PrefService::Preference& ac_screen_dim_delay_ms_pref,
+      const PrefService::Preference& ac_screen_off_delay_ms_pref,
+      const PrefService::Preference& ac_screen_lock_delay_ms_pref,
+      const PrefService::Preference& ac_idle_delay_ms_pref,
+      const PrefService::Preference& battery_screen_dim_delay_ms_pref,
+      const PrefService::Preference& battery_screen_off_delay_ms_pref,
+      const PrefService::Preference& battery_screen_lock_delay_ms_pref,
+      const PrefService::Preference& battery_idle_delay_ms_pref,
+      const PrefService::Preference& idle_action_pref,
+      const PrefService::Preference& lid_closed_action_pref,
+      const PrefService::Preference& use_audio_activity_pref,
+      const PrefService::Preference& use_video_activity_pref,
+      const PrefService::Preference& presentation_idle_delay_factor_pref);
 
   // DBusThreadManagerObserver implementation:
   virtual void OnDBusThreadManagerDestroying(DBusThreadManager* manager)