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

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/session_startup_pref.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // Unit tests for SessionStartupPref.
 class SessionStartupPrefTest : public testing::Test {
  public:
   void SetUp() override {
     pref_service_.reset(new TestingPrefServiceSyncable);
     SessionStartupPref::RegisterProfilePrefs(registry());
     registry()->RegisterBooleanPref(prefs::kHomePageIsNewTabPage, true);
   }
 
   bool IsUseLastOpenDefault() {

[bartfab (slow), 2015/08/31 15:36:43]

Nit: This can be removed now.

[sdefresne, 2015/09/02 11:30:19]

Removed.

     // 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();
@@ skipping 36 matching lines @@
   override_test.urls.push_back(GURL("dev.chromium.org"));
   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) {

[bartfab (slow), 2015/08/31 15:36:43]

Nit: This is obsolete now as well.

[sdefresne, 2015/09/02 11:30:19]

Removed.

   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) {

[bartfab (slow), 2015/08/31 15:36:43]

Nit: This is obsolete now as well.

[sdefresne, 2015/09/02 11:30:19]

Removed.

   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);
-}