Introduce PrefRegistrySyncable, simplifying PrefServiceSyncable.

chrome/browser/prefs/session_startup_pref_unittest.cc

 // 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_registry_syncable.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #if defined(OS_MACOSX)
 #include "chrome/browser/ui/cocoa/window_restore_utils.h"
 #endif
 
 // Unit tests for SessionStartupPref.
 class SessionStartupPrefTest : public testing::Test {
  public:
   virtual void SetUp() {
     pref_service_.reset(new TestingPrefServiceSyncable);
-    SessionStartupPref::RegisterUserPrefs(pref_service_.get());
-    pref_service_->RegisterBooleanPref(prefs::kHomePageIsNewTabPage,
-                                       true,
-                                       PrefServiceSyncable::UNSYNCABLE_PREF);
+    SessionStartupPref::RegisterUserPrefs(registry());
+    registry()->RegisterBooleanPref(prefs::kHomePageIsNewTabPage,
+                                    true,
+                                    PrefRegistrySyncable::UNSYNCABLE_PREF);
     // Make the tests independent of the Mac startup pref migration (see
     // SessionStartupPref::MigrateMacDefaultPrefIfNecessary).
-    pref_service_->RegisterStringPref(prefs::kProfileCreatedByVersion,
-                                      "22.0.0.0",
-                                      PrefServiceSyncable::UNSYNCABLE_PREF);
+    registry()->RegisterStringPref(prefs::kProfileCreatedByVersion,
+                                   "22.0.0.0",
+                                   PrefRegistrySyncable::UNSYNCABLE_PREF);
   }
 
   bool IsUseLastOpenDefault() {
     // On ChromeOS, the default SessionStartupPref is LAST.
 #if defined(OS_CHROMEOS)
     return true;
 #else
     return false;
 #endif
   }
 
+  PrefRegistrySyncable* registry() {
+    return pref_service_->registry();
+  }
+
   scoped_ptr<TestingPrefServiceSyncable> pref_service_;
 };
 
 TEST_F(SessionStartupPrefTest, URLListIsFixedUp) {
   ListValue* url_pref_list = new ListValue;
   url_pref_list->Set(0, Value::CreateStringValue("google.com"));
   url_pref_list->Set(1, Value::CreateStringValue("chromium.org"));
   pref_service_->SetUserPref(prefs::kURLsToRestoreOnStartup, url_pref_list);
 
   SessionStartupPref result =
@@ skipping 25 matching lines @@
   SessionStartupPref::SetStartupPref(pref_service_.get(), override_test);
 
   result = SessionStartupPref::GetStartupPref(pref_service_.get());
   EXPECT_EQ(3u, result.urls.size());
 }
 
 // Checks to make sure that if the user had previously not selected anything
 // (so that, in effect, the default value "Open the homepage" was selected),
 // their preferences are migrated on upgrade to m19.
 TEST_F(SessionStartupPrefTest, DefaultMigration) {
-  pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, false);
 
   EXPECT_FALSE(pref_service_->HasPrefPath(prefs::kRestoreOnStartup));
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(
       pref_service_.get());
 
   if (IsUseLastOpenDefault()) {
     EXPECT_EQ(SessionStartupPref::LAST, pref.type);
     EXPECT_EQ(0U, pref.urls.size());
   } else {
     EXPECT_EQ(SessionStartupPref::URLS, pref.type);
     EXPECT_EQ(1U, pref.urls.size());
     EXPECT_EQ(GURL("http://chromium.org/"), pref.urls[0]);
   }
 }
 
 // Checks to make sure that if the user had previously not selected anything
 // (so that, in effect, the default value "Open the homepage" was selected),
 // 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) {
-  pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
+                                 PrefRegistrySyncable::UNSYNCABLE_PREF);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, true);
 
   EXPECT_FALSE(pref_service_->HasPrefPath(prefs::kRestoreOnStartup));
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(
       pref_service_.get());
 
   if (IsUseLastOpenDefault())
     EXPECT_EQ(SessionStartupPref::LAST, pref.type);
   else
     EXPECT_EQ(SessionStartupPref::DEFAULT, pref.type);
 
   // The "URLs to restore on startup" shouldn't get migrated.
   EXPECT_EQ(0U, pref.urls.size());
 }
 
 // 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) {
-  pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
+                                 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
   // using the pref service directly.
   pref_service_->SetInteger(prefs::kRestoreOnStartup, /*kPrefValueHomePage*/ 0);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, false);
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(
       pref_service_.get());
 
   EXPECT_EQ(SessionStartupPref::URLS, pref.type);
   EXPECT_EQ(1U, pref.urls.size());
   EXPECT_EQ(GURL("http://chromium.org/"), pref.urls[0]);
 }
 
 // Checks to make sure that if the user had previously selected "Open the
 // "homepage", and the NTP is being used for the homepage, their preferences
 // are migrated on upgrade to M19.
 TEST_F(SessionStartupPrefTest, HomePageMigrationHomepageIsNTP) {
-  pref_service_->RegisterStringPref(prefs::kHomePage, "http://google.com/",
-                                    PrefServiceSyncable::UNSYNCABLE_PREF);
+  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/",
+                                 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
   // using the pref service directly.
   pref_service_->SetInteger(prefs::kRestoreOnStartup, /*kPrefValueHomePage*/ 0);
   pref_service_->SetString(prefs::kHomePage, "http://chromium.org/");
   pref_service_->SetBoolean(prefs::kHomePageIsNewTabPage, true);
 
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(
       pref_service_.get());
@@ skipping 13 matching lines @@
 
   // Trigger the migration.
   SessionStartupPref pref = SessionStartupPref::GetStartupPref(
       pref_service_.get());
 
   // The pref is now explicit.
   EXPECT_EQ(SessionStartupPref::LAST, pref.type);
   EXPECT_FALSE(SessionStartupPref::TypeIsDefault(pref_service_.get()));
 }
 #endif