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

chrome/browser/ui/browser_init.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/ui/browser_init.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "base/bind.h"
@@ skipping 1161 matching lines @@
   RecordAppLaunches(profile_, urls_to_open, tabs);
 
   if (!urls_to_open.empty()) {
     // If urls were specified on the command line, use them.
     UrlsToTabs(urls_to_open, &tabs);
   } else if (pref.type == SessionStartupPref::URLS && !pref.urls.empty()) {
     // Only use the set of urls specified in preferences if nothing was
     // 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())
     return NULL;
 
   Browser* browser = OpenTabsInBrowser(NULL, true, tabs);
   return browser;
 }
 
 void BrowserInit::LaunchWithProfile::AddUniqueURLs(
@@ skipping 723 matching lines @@
 
   Profile* profile = ProfileManager::GetLastUsedProfile();
   if (!profile) {
     // We should only be able to get here if the profile already exists and
     // has been created.
     NOTREACHED();
     return;
   }
   ProcessCmdLineImpl(cmd_line, cur_dir, false, profile, Profiles(), NULL, NULL);
 }