diff options
| author | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 15:33:24 +0000 |
|---|---|---|
| committer | asvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-24 15:33:24 +0000 |
| commit | 90f430f67ebd159d563823bf6d17555471eaa50a (patch) | |
| tree | 665eaca463c6095943263f324d418b4bcb2e81d8 /chrome/browser/printing | |
| parent | 158b24d3b027d17067defef3836a33f3e2253bde (diff) | |
| download | chromium_src-90f430f67ebd159d563823bf6d17555471eaa50a.zip chromium_src-90f430f67ebd159d563823bf6d17555471eaa50a.tar.gz chromium_src-90f430f67ebd159d563823bf6d17555471eaa50a.tar.bz2 | |
Revert 285173 "Removed InProcessBrowserTest::CleanUpOnMainThread()"
suspected to have broken ChromeOS browsertests:
SessionRestoreTestChromeOS.RestoreAppsV1
SessionRestoreTestChromeOS.RestoreBrowserWindows
SessionRestoreTestChromeOS.RestoreMaximized
Sample failure output:
SessionRestoreTestChromeOS.RestoreBrowserWindows (run #1):
[ RUN ] SessionRestoreTestChromeOS.RestoreBrowserWindows
[7235:7235:0724/051700:WARNING:chrome_browser_main_chromeos.cc(275)] Running as stub user with profile dir: test-user
Xlib: extension "RANDR" missing on display ":9".
[7235:7377:0724/051700:WARNING:local_extension_cache.cc(199)] Extensions will not be installed from update URLs until /var/cache/external_cache/.initialized exists.
../../chrome/browser/sessions/session_restore_browsertest_chromeos.cc:118: Failure
Value of: total_count
Actual: 1
Expected: 2u
Which is: 2
[7235:7331:0724/051701:WARNING:raw_channel_posix.cc(214)] recvmsg: Connection reset by peer
[ FAILED ] SessionRestoreTestChromeOS.RestoreBrowserWindows, where TypeParam = and GetParam() = (827 ms)
> Removed InProcessBrowserTest::CleanUpOnMainThread()
>
> Changed all instances of superfluous InProcessBrowserTest::CleanUpOnMainThread()
> API to use BrowserTestBase::TearDownOnMainThread() instead.
>
> BUG=381181
> TBR=rockot@chromium.org,sky@chromium.org,nkostylev@chromium.org
>
> Review URL: https://codereview.chromium.org/366813007
TBR=atwilson@chromium.org
Review URL: https://codereview.chromium.org/415133002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285278 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing')
| -rw-r--r-- | chrome/browser/printing/print_preview_dialog_controller_browsertest.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc index 232ee1a..0ef7e3d 100644 --- a/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc +++ b/chrome/browser/printing/print_preview_dialog_controller_browsertest.cc @@ -139,7 +139,7 @@ class PrintPreviewDialogControllerBrowserTest : public InProcessBrowserTest { ASSERT_NE(first_tab, initiator_); } - virtual void TearDownOnMainThread() OVERRIDE { + virtual void CleanUpOnMainThread() OVERRIDE { cloned_tab_observer_.reset(); initiator_ = NULL; } |