Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(82)

Unified Diff: chrome/browser/apps/app_browsertest.cc

Issue 419523003: Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/apps/app_browsertest.cc
diff --git a/chrome/browser/apps/app_browsertest.cc b/chrome/browser/apps/app_browsertest.cc
index c349fa0ba6d7ee4d108ef9ee35c7e2798a22995c..a5a75823538c2a0780df22b8cb7a5bebc28f9657 100644
--- a/chrome/browser/apps/app_browsertest.cc
+++ b/chrome/browser/apps/app_browsertest.cc
@@ -1213,9 +1213,9 @@ class RestartDeviceTest : public PlatformAppBrowserTest {
.WillRepeatedly(testing::Return(true));
}
- virtual void CleanUpOnMainThread() OVERRIDE {
+ virtual void TearDownOnMainThread() OVERRIDE {
user_manager_enabler_.reset();
- PlatformAppBrowserTest::CleanUpOnMainThread();
+ PlatformAppBrowserTest::TearDownOnMainThread();
}
virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {

Powered by Google App Engine
This is Rietveld 408576698