Fixes two session restore bugs:...

chrome/browser/sessions/session_restore.cc

 // Copyright (c) 2006-2008 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/sessions/session_restore.h"
 
 #include <vector>
 
 #include "base/scoped_ptr.h"
 #include "chrome/browser/browser.h"
@@ skipping 399 matching lines @@
 // static
 size_t SessionRestore::num_tabs_to_load_ = 0;
 
 static void Restore(Profile* profile,
                     Browser* browser,
                     bool synchronous,
                     bool clobber_existing_window,
                     bool always_create_tabbed_browser,
                     const std::vector<GURL>& urls_to_open) {
   DCHECK(profile);
-  if (!profile->GetSessionService())
+  // Always restore from the original profile (incognito profiles have no
+  // session service).
+  profile = profile->GetOriginalProfile();
+  if (!profile->GetSessionService()) {
+    NOTREACHED();
     return;
+  }
   // SessionRestoreImpl takes care of deleting itself when done.
   SessionRestoreImpl* restorer =
       new SessionRestoreImpl(profile, browser, synchronous,
                              clobber_existing_window,
                              always_create_tabbed_browser, urls_to_open);
   restorer->Restore();
 }
 
 // static
 void SessionRestore::RestoreSession(Profile* profile,
                                     Browser* browser,
                                     bool clobber_existing_window,
                                     bool always_create_tabbed_browser,
                                     const std::vector<GURL>& urls_to_open) {
   Restore(profile, browser, false, clobber_existing_window,
           always_create_tabbed_browser, urls_to_open);
 }
 
 // static
 void SessionRestore::RestoreSessionSynchronously(
     Profile* profile,
     const std::vector<GURL>& urls_to_open) {
   Restore(profile, NULL, true, false, true, urls_to_open);
 }