Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/apps/app_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/app_window.h"
 #include "apps/app_window_registry.h"
 #include "apps/launcher.h"
 #include "apps/ui/native_app_window.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 1195 matching lines @@
     mock_user_manager_ = new chromeos::MockUserManager;
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(mock_user_manager_));
 
     EXPECT_CALL(*mock_user_manager_, IsUserLoggedIn())
         .WillRepeatedly(testing::Return(true));
     EXPECT_CALL(*mock_user_manager_, IsLoggedInAsKioskApp())
         .WillRepeatedly(testing::Return(true));
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     user_manager_enabler_.reset();
-    PlatformAppBrowserTest::CleanUpOnMainThread();
+    PlatformAppBrowserTest::TearDownOnMainThread();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     PlatformAppBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   int num_request_restart_calls() const {
     return power_manager_client_->num_request_restart_calls();
   }
 
@@ skipping 52 matching lines @@
         LoadAndLaunchPlatformApp("reinstall_data_cleanup", "Launched");
     ASSERT_TRUE(extension);
     ASSERT_EQ(extension_id, extension->id());
 
     ExtensionApiTest::ResultCatcher result_catcher;
     EXPECT_TRUE(result_catcher.GetNextResult());
   }
 }
 
 }  // namespace extensions