commit 443e93170c8d4db335384b340571fd3cb9c3bbb7
author tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon May 06 06:17:34 2013
committer tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Mon May 06 06:17:34 2013
tree a3a48f898d87d24530b57888b7244806118d8337
parent b713132324bcb1c387fafacef68f6b275931551b

components: Move PrefRegistrySyncable into user_prefs namespace.

BUG=180785
R=joi@chromium.org
TBR=darin@chromium.org

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

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

chrome/browser/prefs/session_startup_pref_unittest.cc

diff --git a/chrome/browser/prefs/session_startup_pref_unittest.cc b/chrome/browser/prefs/session_startup_pref_unittest.cc
index 7f7c5a4..2e3aeb3 100644
--- a/chrome/browser/prefs/session_startup_pref_unittest.cc
+++ b/chrome/browser/prefs/session_startup_pref_unittest.cc
@@ -19,14 +19,16 @@
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSyncable);
     SessionStartupPref::RegisterUserPrefs(registry());
-    registry()->RegisterBooleanPref(prefs::kHomePageIsNewTabPage,
-                                    true,
-                                    PrefRegistrySyncable::UNSYNCABLE_PREF);
+    registry()->RegisterBooleanPref(
+        prefs::kHomePageIsNewTabPage,
+        true,
+        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
     // Make the tests independent of the Mac startup pref migration (see
     // SessionStartupPref::MigrateMacDefaultPrefIfNecessary).
-    registry()->RegisterStringPref(prefs::kProfileCreatedByVersion,
-                                   "22.0.0.0",
-                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
+    registry()->RegisterStringPref(
+        prefs::kProfileCreatedByVersion,
+        "22.0.0.0",
+        user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 
   bool IsUseLastOpenDefault() {
@@ -38,7 +40,7 @@
 #endif
   }
 
-  PrefRegistrySyncable* registry() {
+  user_prefs::PrefRegistrySyncable* registry() {
     return pref_service_->registry();
   }
 
@@ -87,8 +89,10 @@
 // (so that, in effect, the default value "Open the homepage" was selected),
 // their preferences are migrated on upgrade to m19.
 TEST_F(SessionStartupPrefTest, DefaultMigration) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(
+      prefs::kHomePage,
+      "http://google.com/",
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, false);
 
@@ -112,8 +116,10 @@
 // and the NTP is being used for the homepage, their preferences are migrated
 // to "Open the New Tab Page" on upgrade to M19.
 TEST_F(SessionStartupPrefTest, DefaultMigrationHomepageIsNTP) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(
+      prefs::kHomePage,
+      "http://google.com/",
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, true);
 
@@ -134,8 +140,10 @@
 // Checks to make sure that if the user had previously selected "Open the
 // "homepage", their preferences are migrated on upgrade to M19.
 TEST_F(SessionStartupPrefTest, HomePageMigration) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(
+      prefs::kHomePage,
+      "http://google.com/",
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // By design, it's impossible to set the 'restore on startup' pref to 0
   // ("open the homepage") using SessionStartupPref::SetStartupPref(), so set it
@@ -156,8 +164,10 @@
 // "homepage", and the NTP is being used for the homepage, their preferences
 // are migrated on upgrade to M19.
 TEST_F(SessionStartupPrefTest, HomePageMigrationHomepageIsNTP) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(
+      prefs::kHomePage,
+      "http://google.com/",
+      user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
 
   // By design, it's impossible to set the 'restore on startup' pref to 0
   // ("open the homepage") using SessionStartupPref::SetStartupPref(), so set it