diff options
| author | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:51:28 +0000 |
|---|---|---|
| committer | dtu@chromium.org <dtu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-10 18:51:28 +0000 |
| commit | 64b59db5208271c0fe9ac18d83a81f0a1ea11768 (patch) | |
| tree | b728dad5cc4a91e8da58e23e185d4fa4e19997e0 /chrome/browser/sessions | |
| parent | 7ba258d3f308c5149e4fe5d8f2e5be44e480721c (diff) | |
| download | chromium_src-64b59db5208271c0fe9ac18d83a81f0a1ea11768.zip chromium_src-64b59db5208271c0fe9ac18d83a81f0a1ea11768.tar.gz chromium_src-64b59db5208271c0fe9ac18d83a81f0a1ea11768.tar.bz2 | |
Revert 84748 - Fix PyAuto Logout() hook. Currently, logging out disconnects the automation channel but does not re-enable Chrome testing.
BUG=chromium-os:14990
TEST=Manual. Tests will be in chromeos_login.py
Review URL: http://codereview.chromium.org/6981005
TBR=dtu@chromium.org
Review URL: http://codereview.chromium.org/7003004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sessions')
| -rw-r--r-- | chrome/browser/sessions/session_restore_uitest.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/chrome/browser/sessions/session_restore_uitest.cc b/chrome/browser/sessions/session_restore_uitest.cc index 7b0ffdf..79b1990 100644 --- a/chrome/browser/sessions/session_restore_uitest.cc +++ b/chrome/browser/sessions/session_restore_uitest.cc @@ -35,11 +35,13 @@ class SessionRestoreUITest : public UITest { #if defined(OS_MACOSX) set_shutdown_type(ProxyLauncher::USER_QUIT); #endif + UITest::TearDown(); + clear_profile_ = false; launch_arguments_.AppendSwitchASCII(switches::kRestoreLastSession, base::IntToString(expected_tab_count)); - ResetConnection(); + UITest::SetUp(); } void CloseWindow(int window_index, int initial_count) { |