Attempt at fixing flakeyness when running session restore ui tests in...

chrome/browser/sessions/session_restore_uitest.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 "base/command_line.h"
 #include "base/file_util.h"
 #include "base/scoped_ptr.h"
+#include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/tab_proxy.h"
 #include "chrome/test/automation/browser_proxy.h"
 #include "chrome/test/automation/window_proxy.h"
 #include "chrome/test/ui/ui_test.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/net_util.h"
 #include "net/url_request/url_request_unittest.h"
 
 namespace {
 
 class SessionRestoreUITest : public UITest {
  protected:
   SessionRestoreUITest() : UITest() {
     FilePath path_prefix = FilePath::FromWStringHack(test_data_directory_);
     path_prefix = path_prefix.AppendASCII("session_history")
         .Append(FilePath::StringType(&FilePath::kSeparators[0], 1));
 
     url1 = net::FilePathToFileURL(
         path_prefix.AppendASCII("bot1.html"));
     url2 = net::FilePathToFileURL(
         path_prefix.AppendASCII("bot2.html"));
     url3 = net::FilePathToFileURL(
         path_prefix.AppendASCII("bot3.html"));
   }
 
-  virtual void QuitBrowserAndRestore() {
+  virtual void QuitBrowserAndRestore(int expected_tab_count) {
     UITest::TearDown();
 
     clear_profile_ = false;
 
-    launch_arguments_.AppendSwitch(switches::kRestoreLastSession);
+    launch_arguments_.AppendSwitchWithValue(switches::kRestoreLastSession,
+                                            IntToWString(expected_tab_count));
     UITest::SetUp();
   }
 
   void CloseWindow(int window_index, int initial_count) {
     scoped_ptr<BrowserProxy> browser_proxy(
         automation()->GetBrowserWindow(window_index));
     ASSERT_TRUE(browser_proxy.get());
     ASSERT_TRUE(browser_proxy->ApplyAccelerator(IDC_CLOSE_WINDOW));
     browser_proxy.reset();
     int window_count;
@@ skipping 37 matching lines @@
  private:
   DISALLOW_EVIL_CONSTRUCTORS(SessionRestoreUITest);
 };
 
 }  // namespace
 
 TEST_F(SessionRestoreUITest, Basic) {
   NavigateToURL(url1);
   NavigateToURL(url2);
 
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(1);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
 
   ASSERT_EQ(url2, GetActiveTabURL());
   tab_proxy->GoBack();
   ASSERT_EQ(url1, GetActiveTabURL());
 }
 
 TEST_F(SessionRestoreUITest, RestoresForwardAndBackwardNavs) {
   NavigateToURL(url1);
   NavigateToURL(url2);
   NavigateToURL(url3);
 
   scoped_ptr<TabProxy> active_tab(GetActiveTab());
   ASSERT_TRUE(active_tab->GoBack());
 
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(1);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
 
@@ skipping 17 matching lines @@
   GURL cross_site_url(server->TestServerPageW(L"files/title2.html"));
 
   // Visit URLs on different sites.
   NavigateToURL(url1);
   NavigateToURL(cross_site_url);
   NavigateToURL(url2);
 
   scoped_ptr<TabProxy> active_tab(GetActiveTab());
   ASSERT_TRUE(active_tab->GoBack());
 
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(1);
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   int tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count) && tab_count == 1);
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
@@ skipping 22 matching lines @@
 
   // NOTE: Don't use GetActiveWindow here, when run with the screen locked
   // active windows returns NULL.
   int window_count;
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
 
   ASSERT_TRUE(browser_proxy->AppendTab(url2));
 
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(2);
   browser_proxy.reset();
 
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   browser_proxy.reset(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
 
   int tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&tab_count));
   ASSERT_EQ(2, tab_count);
@@ skipping 24 matching lines @@
   ASSERT_TRUE(automation()->GetBrowserWindowCount(&window_count) &&
               window_count == 1);
   scoped_ptr<BrowserProxy> browser_proxy(automation()->GetBrowserWindow(0));
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(0));
 
   browser_proxy->AppendTab(url2);
 
   scoped_ptr<TabProxy> active_tab(browser_proxy->GetActiveTab());
   active_tab->Close(true);
 
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(1);
   browser_proxy.reset();
   tab_proxy.reset();
 
   AssertOneWindowWithOneTab();
 
   ASSERT_TRUE(GetActiveTabURL() == url1);
 }
 
 // This test is failing on win2k.
 //
@@ skipping 61 matching lines @@
   int window_count;
   ASSERT_TRUE(automation()->WaitForWindowCountToChange(1, &window_count,
                                                        action_timeout_ms()) &&
               window_count == 2);
 
   // Close it.
   CloseWindow(1, 2);
 
   // Restart and make sure we have only one window with one tab and the url
   // is url1.
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(1);
 
   AssertOneWindowWithOneTab();
 
   ASSERT_TRUE(GetActiveTabURL() == url1);
 }
 
 // This test is disabled because it's triggering a bug in chrome_plugin_host.
 //
 // Launches an app window, closes tabbed browser, launches and makes sure
 // we restore the tabbed browser url.
@@ skipping 63 matching lines @@
                                                      action_timeout_ms()));
   last_tab.reset(browser_proxy->GetTab(new_tab_count - 1));
   ASSERT_TRUE(last_tab.get() != NULL);
   // Do a reload to ensure new tab page has loaded.
   ASSERT_TRUE(last_tab->Reload());
   int expected_process_count = GetBrowserProcessCount();
 
   // Restart.
   browser_proxy.reset();
   last_tab.reset();
-  QuitBrowserAndRestore();
+  QuitBrowserAndRestore(3);
 
   // Wait for each tab to finish being restored, then make sure the process
   // count matches.
   browser_proxy.reset(automation()->GetBrowserWindow(0));
   ASSERT_TRUE(browser_proxy.get() != NULL);
   int restored_tab_count;
   ASSERT_TRUE(browser_proxy->GetTabCount(&restored_tab_count));
   ASSERT_EQ(new_tab_count, restored_tab_count);
 
   scoped_ptr<TabProxy> tab_proxy(browser_proxy->GetTab(restored_tab_count - 2));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
   tab_proxy.reset(browser_proxy->GetTab(restored_tab_count - 1));
   ASSERT_TRUE(tab_proxy.get() != NULL);
   ASSERT_TRUE(tab_proxy->WaitForTabToBeRestored(action_timeout_ms()));
 
   ASSERT_EQ(expected_process_count, GetBrowserProcessCount());
 }