summaryrefslogtreecommitdiffstats
path: root/chrome/test/startup
diff options
context:
space:
mode:
authordtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 17:49:52 +0000
committerdtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-01 17:49:52 +0000
commit7434850752c816283c53d402efe061270904af2b (patch)
treed2210ba1c109a522896aa1d9472e359b95d19055 /chrome/test/startup
parentf159e8dd0e5369dcd48f3abc6fdf0c6a9038827a (diff)
downloadchromium_src-7434850752c816283c53d402efe061270904af2b.zip
chromium_src-7434850752c816283c53d402efe061270904af2b.tar.gz
chromium_src-7434850752c816283c53d402efe061270904af2b.tar.bz2
Fix and refactor for ProxyLauncher browser disconnect.
In ProxyLauncher, the new TerminateConnection() function is paired with InitializeConnection(). shutdown_type_ moved from UITestBase to ProxyLauncher, since that's the only place it's used. BUG=chromium-os:8514 TEST=none Review URL: http://codereview.chromium.org/6248022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@73300 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/startup')
-rw-r--r--chrome/test/startup/startup_test.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/test/startup/startup_test.cc b/chrome/test/startup/startup_test.cc
index 437a844..8e0e826 100644
--- a/chrome/test/startup/startup_test.cc
+++ b/chrome/test/startup/startup_test.cc
@@ -275,7 +275,7 @@ void StartupTest::RunPerfTestWithManyTabs(const char* graph, const char* trace,
UITest::SetUp();
// Set flags to ensure profile is saved and can be restored.
#if defined(OS_MACOSX)
- shutdown_type_ = ProxyLauncher::USER_QUIT;
+ set_shutdown_type(ProxyLauncher::USER_QUIT);
#endif
clear_profile_ = false;
// Quit and set flags to restore session.