Revert 124583 (See crbug.com/114259) Original info for r124583 is:

chrome/browser/ui/browser_init.cc

Index: chrome/browser/ui/browser_init.cc
===================================================================
--- chrome/browser/ui/browser_init.cc	(revision 124738)
+++ chrome/browser/ui/browser_init.cc	(working copy)
@@ -1179,16 +1179,16 @@
     // 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())