Fixes bug where triggering session restore while the browser was...

chrome/browser/sessions/session_restore_browsertest.cc

Index: chrome/browser/sessions/session_restore_browsertest.cc
===================================================================
--- chrome/browser/sessions/session_restore_browsertest.cc	(revision 0)
+++ chrome/browser/sessions/session_restore_browsertest.cc	(revision 0)
@@ -0,0 +1,49 @@
+// 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/defaults.h"
+#include "chrome/browser/browser.h"
+#include "chrome/browser/browser_window.h"
+#include "chrome/browser/tab_contents/tab_contents.h"
+#include "chrome/test/in_process_browser_test.h"
+#include "chrome/test/ui_test_utils.h"
+
+typedef InProcessBrowserTest SessionRestoreTest;
+
+// Makes sure when session restore is triggered in the same process we don't end
+// up with an extra tab.
+IN_PROC_BROWSER_TEST_F(SessionRestoreTest,
+                       RestoreOnNewWindowWithNoTabbedBrowsers) {
+  if (browser_defaults::kRestorePopups)
+    return;
+
+  GURL url(ui_test_utils::GetTestUrl(L".", L"title1.html"));
+  ui_test_utils::NavigateToURL(browser(), url);
+
+  // Turn on session restore.
+  SessionStartupPref::SetStartupPref(
+      browser()->profile(),
+      SessionStartupPref(SessionStartupPref::LAST));
+
+  // Create a new popup.
+  Profile* profile = browser()->profile();
+  Browser* popup = Browser::CreateForPopup(profile);
+  popup->window()->Show();
+
+  // Close the browser.
+  browser()->window()->Close();
+
+  // Create a new window, which should trigger session restore.
+  popup->NewWindow();
+
+  Browser* new_browser = ui_test_utils::WaitForNewBrowser();
+
+  EXPECT_TRUE(new_browser != NULL);

[Paweł Hajdan Jr., 2010/03/26 08:03:20]

This should be ASSERT_TRUE to avoid a crash.

+
+  // The browser should only have one tab.
+  EXPECT_EQ(1, new_browser->tab_count());

[Paweł Hajdan Jr., 2010/03/26 08:03:20]

Same here.

+
+  // And the first url should be url.
+  EXPECT_EQ(url, new_browser->GetTabContentsAt(0)->GetURL());
+}
Property changes on: chrome/browser/sessions/session_restore_browsertest.cc
___________________________________________________________________
Added: svn:eol-style
   + LF