4 files changed, 79 insertions, 3 deletions
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 395d84e..6321593 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -8,8 +8,8 @@
 #include <vector>
 
 #include "base/logging.h"
-#include "base/string_number_conversions.h"
 #include "base/string_split.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_switches.h"
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 5f44b0a..5b5410a4 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -13,8 +13,8 @@
 #include "base/metrics/histogram.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/stl_util.h"
-#include "base/string_number_conversions.h"
 #include "base/string_util.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/value_conversions.h"
 #include "build/build_config.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"
diff --git a/chrome/browser/prefs/pref_service_simple.cc b/chrome/browser/prefs/pref_service_simple.cc
new file mode 100644
index 0000000..c19fd86
--- /dev/null
+++ b/chrome/browser/prefs/pref_service_simple.cc
@@ -0,0 +1,76 @@
+// Copyright (c) 2012 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 "chrome/browser/prefs/pref_service.h"
+
+#include "base/file_path.h"
+#include "base/strings/string_number_conversions.h"
+#include "base/values.h"
+
+PrefServiceSimple::PrefServiceSimple(
+      PrefNotifierImpl* pref_notifier,
+      PrefValueStore* pref_value_store,
+      PersistentPrefStore* user_prefs,
+      DefaultPrefStore* default_store,
+      base::Callback<void(PersistentPrefStore::PrefReadError)>
+          read_error_callback,
+      bool async)
+    : PrefService(pref_notifier,
+                  pref_value_store,
+                  user_prefs,
+                  default_store,
+                  read_error_callback,
+                  async) {
+}
+
+PrefServiceSimple::~PrefServiceSimple() {}
+
+void PrefServiceSimple::RegisterBooleanPref(const char* path,
+                                            bool default_value) {
+  RegisterPreference(path, Value::CreateBooleanValue(default_value));
+}
+
+void PrefServiceSimple::RegisterIntegerPref(const char* path,
+                                            int default_value) {
+  RegisterPreference(path, Value::CreateIntegerValue(default_value));
+}
+
+void PrefServiceSimple::RegisterDoublePref(const char* path,
+                                           double default_value) {
+  RegisterPreference(path, Value::CreateDoubleValue(default_value));
+}
+
+void PrefServiceSimple::RegisterStringPref(const char* path,
+                                           const std::string& default_value) {
+  RegisterPreference(path, Value::CreateStringValue(default_value));
+}
+
+void PrefServiceSimple::RegisterFilePathPref(const char* path,
+                                             const FilePath& default_value) {
+  RegisterPreference(path, Value::CreateStringValue(default_value.value()));
+}
+
+void PrefServiceSimple::RegisterListPref(const char* path) {
+  RegisterPreference(path, new ListValue());
+}
+
+void PrefServiceSimple::RegisterListPref(const char* path,
+                                         ListValue* default_value) {
+  RegisterPreference(path, default_value);
+}
+
+void PrefServiceSimple::RegisterDictionaryPref(const char* path) {
+  RegisterPreference(path, new DictionaryValue());
+}
+
+void PrefServiceSimple::RegisterDictionaryPref(const char* path,
+                                               DictionaryValue* default_value) {
+  RegisterPreference(path, default_value);
+}
+
+void PrefServiceSimple::RegisterInt64Pref(const char* path,
+                                          int64 default_value) {
+  RegisterPreference(
+      path, Value::CreateStringValue(base::Int64ToString(default_value)));
+}
diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc
index d92e68b..bbb7f0e 100644
--- a/chrome/browser/prefs/pref_service_syncable.cc
+++ b/chrome/browser/prefs/pref_service_syncable.cc
@@ -8,7 +8,7 @@
 #include "base/file_path.h"
 #include "base/prefs/default_pref_store.h"
 #include "base/prefs/overlay_user_pref_store.h"
-#include "base/string_number_conversions.h"
+#include "base/strings/string_number_conversions.h"
 #include "base/value_conversions.h"
 #include "chrome/browser/prefs/pref_model_associator.h"
 #include "chrome/browser/prefs/pref_notifier_impl.h"