Bug 111139: Deprecate HOMEPAGE option, remove the UI for it, migrate users away from it

chrome/browser/ui/browser_init.cc

Index: chrome/browser/ui/browser_init.cc
diff --git a/chrome/browser/ui/browser_init.cc b/chrome/browser/ui/browser_init.cc
index 2e8a1378eb8406e72ebfc2461e2835c9595156bf..c3b3a4a27d6218717fc0a8bb5e60573b129fecff 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -1174,16 +1174,16 @@ Browser* BrowserInit::LaunchWithProfile::ProcessSpecifiedURLs(
     // specified on the command line. Filter out any urls that are to be
     // restored by virtue of having been previously pinned.
     AddUniqueURLs(pref.urls, &tabs);
-  } else if (pref.type == SessionStartupPref::HOMEPAGE && !tabs.empty()) {
-    // Make sure the home page is opened even if there are pinned tabs.
-    std::vector<GURL> urls;
-    AddStartupURLs(&urls);
-    UrlsToTabs(urls, &tabs);
   } else if (pref.type == SessionStartupPref::DEFAULT) {
     Tab tab;
     tab.is_pinned = false;
     tab.url = GURL(chrome::kChromeUINewTabURL);
     tabs.push_back(tab);
+  } else if (pref.type == SessionStartupPref::HOMEPAGE) {
+    // If the user had 'homepage' selected, we should have migrated them to
+    // 'URLs' instead.
+    DLOG(ERROR) << "pref.type == HOMEPAGE";
+    NOTREACHED();
   }
 
   if (tabs.empty())