base/prefs: Break the dependency on chrome/common/pref_names.h

BUG=155525
TEST=unit_tests
R=joi@chromium.org

Review URL: https://codereview.chromium.org/11414133

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

4 files changed, 29 insertions, 27 deletions

diff --git a/base/prefs/DEPS b/base/prefs/DEPS
index 308d139..0218e6c 100644
--- a/base/prefs/DEPS
+++ b/base/prefs/DEPS
@@ -1,8 +1,6 @@
 specific_include_rules = {
   '.*_[a-z]+test\.cc': [
-    "!chrome/common/chrome_notification_types.h",
     "!chrome/common/chrome_paths.h",
-    "!chrome/common/pref_names.h",
     "!chrome/test/base/testing_pref_service.h",
     "!content/public/browser/notification_details.h",
     "!content/public/browser/notification_source.h",
diff --git a/base/prefs/json_pref_store_unittest.cc b/base/prefs/json_pref_store_unittest.cc
index c596a6b..5eac326 100644
--- a/base/prefs/json_pref_store_unittest.cc
+++ b/base/prefs/json_pref_store_unittest.cc
@@ -15,12 +15,13 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/chrome_paths.h"
-#include "chrome/common/pref_names.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
+const char kHomePage[] = "homepage";
+
 class MockPrefStoreObserver : public PrefStore::Observer {
  public:
   MOCK_METHOD1(OnPrefValueChanged, void (const std::string&));
@@ -96,7 +97,7 @@ void RunBasicJsonPrefStoreTest(JsonPrefStore* pref_store,
   std::string cnn("http://www.cnn.com");
 
   const Value* actual;
-  EXPECT_TRUE(pref_store->GetValue(prefs::kHomePage, &actual));
+  EXPECT_TRUE(pref_store->GetValue(kHomePage, &actual));
   std::string string_value;
   EXPECT_TRUE(actual->GetAsString(&string_value));
   EXPECT_EQ(cnn, string_value);
diff --git a/base/prefs/overlay_user_pref_store_unittest.cc b/base/prefs/overlay_user_pref_store_unittest.cc
index d6615af..80d3586 100644
--- a/base/prefs/overlay_user_pref_store_unittest.cc
+++ b/base/prefs/overlay_user_pref_store_unittest.cc
@@ -6,7 +6,6 @@
 #include "base/prefs/pref_store_observer_mock.h"
 #include "base/prefs/testing_pref_store.h"
 #include "base/values.h"
-#include "chrome/common/pref_names.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -15,8 +14,11 @@ using ::testing::StrEq;
 
 namespace {
 
-const char* overlay_key = prefs::kBrowserWindowPlacement;
-const char* regular_key = prefs::kShowBookmarkBar;
+const char kBrowserWindowPlacement[] = "browser.window_placement";
+const char kShowBookmarkBar[] = "bookmark_bar.show_on_all_tabs";
+
+const char* overlay_key = kBrowserWindowPlacement;
+const char* regular_key = kShowBookmarkBar;
 // With the removal of the kWebKitGlobalXXX prefs, we'll no longer have real
 // prefs using the overlay pref store, so make up keys here.
 const char* mapped_overlay_key = "test.per_tab.javascript_enabled";
diff --git a/base/prefs/public/pref_change_registrar_unittest.cc b/base/prefs/public/pref_change_registrar_unittest.cc
index 301a0ab..d187129 100644
--- a/base/prefs/public/pref_change_registrar_unittest.cc
+++ b/base/prefs/public/pref_change_registrar_unittest.cc
@@ -4,8 +4,6 @@
 
 #include "base/prefs/public/pref_change_registrar.h"
 #include "base/prefs/public/pref_observer.h"
-#include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
@@ -19,6 +17,10 @@ using testing::Eq;
 
 namespace {
 
+const char kHomePage[] = "homepage";
+const char kHomePageIsNewTabPage[] = "homepage_is_newtabpage";
+const char kApplicationLocale[] = "intl.app_locale";
+
 // TODO(joi): Use PrefObserverMock once it moves to base/prefs/.
 class MockPrefObserver : public PrefObserver {
  public:
@@ -135,13 +137,13 @@ class ObserveSetOfPreferencesTest : public testing::Test,
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefService);
-    pref_service_->RegisterStringPref(prefs::kHomePage,
+    pref_service_->RegisterStringPref(kHomePage,
                                       "http://google.com",
                                       PrefService::UNSYNCABLE_PREF);
-    pref_service_->RegisterBooleanPref(prefs::kHomePageIsNewTabPage,
+    pref_service_->RegisterBooleanPref(kHomePageIsNewTabPage,
                                        false,
                                        PrefService::UNSYNCABLE_PREF);
-    pref_service_->RegisterStringPref(prefs::kApplicationLocale,
+    pref_service_->RegisterStringPref(kApplicationLocale,
                                       "",
                                       PrefService::UNSYNCABLE_PREF);
   }
@@ -152,8 +154,8 @@ class ObserveSetOfPreferencesTest : public testing::Test,
       observer = this;
     PrefChangeRegistrar* pref_set = new PrefChangeRegistrar();
     pref_set->Init(pref_service_.get());
-    pref_set->Add(prefs::kHomePage, observer);
-    pref_set->Add(prefs::kHomePageIsNewTabPage, observer);
+    pref_set->Add(kHomePage, observer);
+    pref_set->Add(kHomePageIsNewTabPage, observer);
     return pref_set;
   }
 
@@ -168,23 +170,23 @@ class ObserveSetOfPreferencesTest : public testing::Test,
 
 TEST_F(ObserveSetOfPreferencesTest, IsObserved) {
   scoped_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar(NULL));
-  EXPECT_TRUE(pref_set->IsObserved(prefs::kHomePage));
-  EXPECT_TRUE(pref_set->IsObserved(prefs::kHomePageIsNewTabPage));
-  EXPECT_FALSE(pref_set->IsObserved(prefs::kApplicationLocale));
+  EXPECT_TRUE(pref_set->IsObserved(kHomePage));
+  EXPECT_TRUE(pref_set->IsObserved(kHomePageIsNewTabPage));
+  EXPECT_FALSE(pref_set->IsObserved(kApplicationLocale));
 }
 
 TEST_F(ObserveSetOfPreferencesTest, IsManaged) {
   scoped_ptr<PrefChangeRegistrar> pref_set(CreatePrefChangeRegistrar(NULL));
   EXPECT_FALSE(pref_set->IsManaged());
-  pref_service_->SetManagedPref(prefs::kHomePage,
+  pref_service_->SetManagedPref(kHomePage,
                                 Value::CreateStringValue("http://crbug.com"));
   EXPECT_TRUE(pref_set->IsManaged());
-  pref_service_->SetManagedPref(prefs::kHomePageIsNewTabPage,
+  pref_service_->SetManagedPref(kHomePageIsNewTabPage,
                                 Value::CreateBooleanValue(true));
   EXPECT_TRUE(pref_set->IsManaged());
-  pref_service_->RemoveManagedPref(prefs::kHomePage);
+  pref_service_->RemoveManagedPref(kHomePage);
   EXPECT_TRUE(pref_set->IsManaged());
-  pref_service_->RemoveManagedPref(prefs::kHomePageIsNewTabPage);
+  pref_service_->RemoveManagedPref(kHomePageIsNewTabPage);
   EXPECT_FALSE(pref_set->IsManaged());
 }
 
@@ -202,20 +204,19 @@ TEST_F(ObserveSetOfPreferencesTest, Observe) {
   scoped_ptr<PrefChangeRegistrar> pref_set(
       CreatePrefChangeRegistrar(&observer));
 
-  EXPECT_CALL(observer, OnPreferenceChanged(pref_service_.get(),
-                                            prefs::kHomePage));
-  pref_service_->SetUserPref(prefs::kHomePage,
+  EXPECT_CALL(observer, OnPreferenceChanged(pref_service_.get(), kHomePage));
+  pref_service_->SetUserPref(kHomePage,
                              Value::CreateStringValue("http://crbug.com"));
   Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, OnPreferenceChanged(pref_service_.get(),
-                                            prefs::kHomePageIsNewTabPage));
-  pref_service_->SetUserPref(prefs::kHomePageIsNewTabPage,
+                                            kHomePageIsNewTabPage));
+  pref_service_->SetUserPref(kHomePageIsNewTabPage,
                              Value::CreateBooleanValue(true));
   Mock::VerifyAndClearExpectations(&observer);
 
   EXPECT_CALL(observer, OnPreferenceChanged(_, _)).Times(0);
-  pref_service_->SetUserPref(prefs::kApplicationLocale,
+  pref_service_->SetUserPref(kApplicationLocale,
                              Value::CreateStringValue("en_US.utf8"));
   Mock::VerifyAndClearExpectations(&observer);
 }