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/browser/sessions/session_restore_uitest.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/browser/sessions/session_restore_uitest.cc')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 051ecf7..5dcbb77 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -32,7 +32,7 @@ class SessionRestoreUITest : public UITest { virtual void QuitBrowserAndRestore(int expected_tab_count) { #if defined(OS_MACOSX) - shutdown_type_ = UITestBase::USER_QUIT; + shutdown_type_ = ProxyLauncher::USER_QUIT; #endif UITest::TearDown(); @@ -444,7 +444,7 @@ TEST_F(SessionRestoreUITest, TwoWindowsCloseOneRestoreOnlyOne) { // process.) // Flaky as per http://crbug.com/52022 TEST_F(SessionRestoreUITest, FLAKY_ShareProcessesOnRestore) { - if (in_process_renderer()) { + if (ProxyLauncher::in_process_renderer()) { // No point in running this test in single process mode. return; } |