diff options
author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 02:49:38 +0000 |
---|---|---|
committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-25 02:49:38 +0000 |
commit | c4340bc0a16df37171acbd99738aa49e3f35cc64 (patch) | |
tree | 0632db925ce6709ff6d957dda9779d60c3bdfe4e /chrome/browser/chrome_main_browsertest.cc | |
parent | f50e9b22e51619f22d33bef0a591f6c4a50559aa (diff) | |
download | chromium_src-c4340bc0a16df37171acbd99738aa49e3f35cc64.zip chromium_src-c4340bc0a16df37171acbd99738aa49e3f35cc64.tar.gz chromium_src-c4340bc0a16df37171acbd99738aa49e3f35cc64.tar.bz2 |
Convert the session restore ui_tests to browser_tests. I renabled the disabled tests; hopefully they're now more flaky.
I found a simple way of launching a browser_test binary as a regular chrome binary which is needed for the app test case. This means I can undo r133560 which I've done here.
BUG=121574,29110,52022
Review URL: https://chromiumcodereview.appspot.com/10202005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133852 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chrome_main_browsertest.cc')
-rw-r--r-- | chrome/browser/chrome_main_browsertest.cc | 59 |
1 files changed, 17 insertions, 42 deletions
diff --git a/chrome/browser/chrome_main_browsertest.cc b/chrome/browser/chrome_main_browsertest.cc index 888079c..5f38cb2 100644 --- a/chrome/browser/chrome_main_browsertest.cc +++ b/chrome/browser/chrome_main_browsertest.cc @@ -8,7 +8,6 @@ #include "base/file_util.h" #include "base/path_service.h" #include "base/process_util.h" -#include "base/test/test_suite.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" #include "chrome/common/chrome_notification_types.h" @@ -20,52 +19,25 @@ #include "content/public/browser/navigation_entry.h" #include "content/public/browser/notification_service.h" #include "content/public/browser/web_contents.h" -#include "content/test/test_launcher.h" #include "net/base/net_util.h" -// These tests don't apply to the Mac version; see -// LaunchAnotherBrowserBlockUntilClosed for details. +// These tests don't apply to the Mac version; see GetCommandLineForRelaunch +// for details. #if !defined(OS_MACOSX) class ChromeMainTest : public InProcessBrowserTest { public: - ChromeMainTest() - : InProcessBrowserTest(), - new_command_line_(CommandLine::ForCurrentProcess()->GetProgram()) { - } - - virtual void SetUpOnMainThread() OVERRIDE { - CommandLine::SwitchMap switches = - CommandLine::ForCurrentProcess()->GetSwitches(); - switches.erase(switches::kUserDataDir); - switches.erase(test_launcher::kGTestFilterFlag); - - for (CommandLine::SwitchMap::const_iterator iter = switches.begin(); - iter != switches.end(); ++iter) { - new_command_line_.AppendSwitchNative((*iter).first, (*iter).second); - } - - FilePath user_data_dir; - PathService::Get(chrome::DIR_USER_DATA, &user_data_dir); - new_command_line_.AppendSwitchPath(switches::kUserDataDir, user_data_dir); + ChromeMainTest() {} - new_command_line_.AppendSwitchASCII( - test_launcher::kGTestFilterFlag, test_launcher::kEmptyTestName); - new_command_line_.AppendSwitch(TestSuite::kSilent); + void Relaunch(const CommandLine& new_command_line) { + base::LaunchProcess(new_command_line, base::LaunchOptions(), NULL); } - - void Relaunch() { - base::LaunchProcess(new_command_line_, base::LaunchOptions(), NULL); - } - - protected: - CommandLine new_command_line_; }; // Make sure that the second invocation creates a new window. IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunch) { ui_test_utils::BrowserAddedObserver observer; - Relaunch(); + Relaunch(GetCommandLineForRelaunch()); observer.WaitForSingleNewBrowser(); ASSERT_EQ(BrowserList::GetBrowserCount(browser()->profile()), 2u); } @@ -73,11 +45,12 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunch) { IN_PROC_BROWSER_TEST_F(ChromeMainTest, ReuseBrowserInstanceWhenOpeningFile) { FilePath test_file_path = ui_test_utils::GetTestFilePath( FilePath(), FilePath().AppendASCII("empty.html")); - new_command_line_.AppendArgPath(test_file_path); + CommandLine new_command_line(GetCommandLineForRelaunch()); + new_command_line.AppendArgPath(test_file_path); ui_test_utils::WindowedNotificationObserver observer( chrome::NOTIFICATION_TAB_ADDED, content::NotificationService::AllSources()); - Relaunch(); + Relaunch(new_command_line); observer.Wait(); GURL url = net::FilePathToFileURL(test_file_path); @@ -94,14 +67,15 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchWithIncognitoUrl) { // Run with --incognito switch and an URL specified. FilePath test_file_path = ui_test_utils::GetTestFilePath( FilePath(), FilePath().AppendASCII("empty.html")); - new_command_line_.AppendSwitch(switches::kIncognito); - new_command_line_.AppendArgPath(test_file_path); + CommandLine new_command_line(GetCommandLineForRelaunch()); + new_command_line.AppendSwitch(switches::kIncognito); + new_command_line.AppendArgPath(test_file_path); - Relaunch(); + Relaunch(new_command_line); // There should be one normal and one incognito window now. ui_test_utils::BrowserAddedObserver observer; - Relaunch(); + Relaunch(new_command_line); observer.WaitForSingleNewBrowser(); ASSERT_EQ(2u, BrowserList::size()); @@ -136,11 +110,12 @@ IN_PROC_BROWSER_TEST_F(ChromeMainTest, SecondLaunchFromIncognitoWithNormalUrl) { // Run with just an URL specified, no --incognito switch. FilePath test_file_path = ui_test_utils::GetTestFilePath( FilePath(), FilePath().AppendASCII("empty.html")); - new_command_line_.AppendArgPath(test_file_path); + CommandLine new_command_line(GetCommandLineForRelaunch()); + new_command_line.AppendArgPath(test_file_path); ui_test_utils::WindowedNotificationObserver tab_observer( chrome::NOTIFICATION_TAB_ADDED, content::NotificationService::AllSources()); - Relaunch(); + Relaunch(new_command_line); tab_observer.Wait(); // There should be one normal and one incognito window now. |