diff options
| author | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 02:04:59 +0000 |
|---|---|---|
| committer | nirnimesh@chromium.org <nirnimesh@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-08 02:04:59 +0000 |
| commit | c405290f60432b22e8e862377b4f00e6177b4451 (patch) | |
| tree | a710eb4876a4ea9013715ba90a27139d5da835bc /chrome/test/startup/shutdown_test.cc | |
| parent | 079443435c92b0294d63682c39a26df3391018c4 (diff) | |
| download | chromium_src-c405290f60432b22e8e862377b4f00e6177b4451.zip chromium_src-c405290f60432b22e8e862377b4f00e6177b4451.tar.gz chromium_src-c405290f60432b22e8e862377b4f00e6177b4451.tar.bz2 | |
Moves everything related to launching and terminating the browser from UITestBase into ProxyLauncher.
The primary changes are in ui_test.* and proxy_launcher.*. The changes in the remaining files are mostly just changing namespaces from UITestBase:: to ProxyLauncher::.
BUG=None.
TEST=All tests should pass. No functionality change.
Review URL: http://codereview.chromium.org/5967003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@70827 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup/shutdown_test.cc')
| -rw-r--r-- | chrome/test/startup/shutdown_test.cc | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/chrome/test/startup/shutdown_test.cc b/chrome/test/startup/shutdown_test.cc index a0d64e1..19033cb 100644 --- a/chrome/test/startup/shutdown_test.cc +++ b/chrome/test/startup/shutdown_test.cc @@ -66,7 +66,7 @@ class ShutdownTest : public UIPerfTest { void RunShutdownTest(const char* graph, const char* trace, bool important, TestSize test_size, - UITest::ShutdownType shutdown_type) { + ProxyLauncher::ShutdownType shutdown_type) { const int kNumCyclesMax = 20; int numCycles = kNumCyclesMax; scoped_ptr<base::Environment> env(base::Environment::Create()); @@ -92,7 +92,7 @@ class ShutdownTest : public UIPerfTest { } set_shutdown_type(shutdown_type); UITest::TearDown(); - timings[i] = browser_quit_time_; + timings[i] = browser_quit_time(); if (i == 0) { // Re-use the profile data after first run so that the noise from @@ -113,27 +113,28 @@ class ShutdownTest : public UIPerfTest { TEST_F(ShutdownTest, SimpleWindowClose) { RunShutdownTest("shutdown", "simple-window-close", - true, /* important */ SIMPLE, UITest::WINDOW_CLOSE); + true, /* important */ SIMPLE, ProxyLauncher::WINDOW_CLOSE); } TEST_F(ShutdownTest, SimpleUserQuit) { RunShutdownTest("shutdown", "simple-user-quit", - true, /* important */ SIMPLE, UITest::USER_QUIT); + true, /* important */ SIMPLE, ProxyLauncher::USER_QUIT); } TEST_F(ShutdownTest, SimpleSessionEnding) { RunShutdownTest("shutdown", "simple-session-ending", - true, /* important */ SIMPLE, UITest::SESSION_ENDING); + true, /* important */ SIMPLE, ProxyLauncher::SESSION_ENDING); } TEST_F(ShutdownTest, TwentyTabsWindowClose) { RunShutdownTest("shutdown", "twentytabs-window-close", - true, /* important */ TWENTY_TABS, UITest::WINDOW_CLOSE); + true, /* important */ TWENTY_TABS, + ProxyLauncher::WINDOW_CLOSE); } TEST_F(ShutdownTest, TwentyTabsUserQuit) { RunShutdownTest("shutdown", "twentytabs-user-quit", - true, /* important */ TWENTY_TABS, UITest::USER_QUIT); + true, /* important */ TWENTY_TABS, ProxyLauncher::USER_QUIT); } // http://crbug.com/40671 @@ -145,7 +146,8 @@ TEST_F(ShutdownTest, TwentyTabsUserQuit) { TEST_F(ShutdownTest, MAYBE_TwentyTabsSessionEnding) { RunShutdownTest("shutdown", "twentytabs-session-ending", - true, /* important */ TWENTY_TABS, UITest::SESSION_ENDING); + true, /* important */ TWENTY_TABS, + ProxyLauncher::SESSION_ENDING); } } // namespace |