[uber] Redoing the homepage selection UI

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 44b04243bf3d57f7f51bebf325da252bb49a9640..32be5c53cb8b72feea68f5203e1ecc1de4bc426f 100644
--- a/chrome/browser/ui/browser_init.cc
+++ b/chrome/browser/ui/browser_init.cc
@@ -1107,11 +1107,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::DEFAULT && !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) {
+    BrowserInit::LaunchWithProfile::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())