Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/chromeos/login/screens/update_screen_browsertest.cc

 // Copyright (c) 2012 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 "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/login/screens/mock_error_screen.h"
 #include "chrome/browser/chromeos/login/screens/mock_screen_observer.h"
@@ skipping 73 matching lines @@
         .WillRepeatedly(Return(mock_error_screen_.get()));
 
     ASSERT_TRUE(WizardController::default_controller() != NULL);
     update_screen_ = WizardController::default_controller()->GetUpdateScreen();
     ASSERT_TRUE(update_screen_ != NULL);
     ASSERT_EQ(WizardController::default_controller()->current_screen(),
               update_screen_);
     update_screen_->screen_observer_ = mock_screen_observer_.get();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     mock_error_screen_.reset();
     mock_error_screen_actor_.reset();
-    WizardInProcessBrowserTest::CleanUpOnMainThread();
+    WizardInProcessBrowserTest::TearDownOnMainThread();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     NetworkPortalDetector::Shutdown();
     WizardInProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
   void SetDefaultNetwork(const std::string& guid) {
     DCHECK(network_portal_detector_);
     network_portal_detector_->SetDefaultNetworkForTesting(guid);
@@ skipping 288 matching lines @@
       chromeos::UpdateEngineClient::UPDATE_RESULT_FAILED);
   EXPECT_CALL(*mock_screen_observer_,
               OnExit(ScreenObserver::UPDATE_ERROR_CHECKING_FOR_UPDATE))
       .Times(1);
 
   update_screen_->OnConnectToNetworkRequested();
   base::MessageLoop::current()->RunUntilIdle();
 }
 
 }  // namespace chromeos