Remove migration of obsolete value for "session.restore_on_startup".

chrome/browser/prefs/session_startup_pref_unittest.cc

Index: 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 06dc1bff26a6782de34d8fecfaf4daf4cea92e40..03d4d58935f6c5ae71fe5be6b598da5b82d69daa 100644
--- a/chrome/browser/prefs/session_startup_pref_unittest.cc
+++ b/chrome/browser/prefs/session_startup_pref_unittest.cc
@@ -18,15 +18,6 @@ class SessionStartupPrefTest : public testing::Test {
     registry()->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true);
   }
 
-  bool IsUseLastOpenDefault() {
-    // On ChromeOS, the default SessionStartupPref is LAST.
-#if defined(OS_CHROMEOS)
-    return true;
-#else
-    return false;
-#endif
-  }
-
   user_prefs::PrefRegistrySyncable* registry() {
     return pref_service_->registry();
   }
@@ -71,88 +62,3 @@ TEST_F(SessionStartupPrefTest, URLListManagedOverridesUser) {
   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) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/");
-  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) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/");
-  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) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/");
-
-  // 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) {
-  registry()->RegisterStringPref(prefs::kHomePage, "http://google.com/");
-
-  // 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());
-
-  EXPECT_EQ(SessionStartupPref::DEFAULT, pref.type);
-}