Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/notifications/login_state_notification_blocker_chromeos_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 "ash/shell.h"
 #include "ash/system/system_notifier.h"
 #include "base/command_line.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
@@ skipping 17 matching lines @@
   LoginStateNotificationBlockerChromeOSBrowserTest()
       : chromeos::LoginManagerTest(false),
         state_changed_count_(0) {}
   virtual ~LoginStateNotificationBlockerChromeOSBrowserTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     chromeos::LoginState::Get()->set_always_logged_in(false);
     chromeos::LoginManagerTest::SetUpOnMainThread();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     if (blocker_)
       blocker_->RemoveObserver(this);
     blocker_.reset();
-    chromeos::LoginManagerTest::CleanUpOnMainThread();
+    chromeos::LoginManagerTest::TearDownOnMainThread();
   }
 
  protected:
   void CreateBlocker() {
     blocker_.reset(new LoginStateNotificationBlockerChromeOS(
         message_center::MessageCenter::Get()));
     blocker_->AddObserver(this);
   }
 
   // message_center::NotificationBlocker::Observer ovverrides:
@@ skipping 79 matching lines @@
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 
   // Multi-login user switch off.
   chromeos::UserAddingScreen::Get()->Cancel();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, GetStateChangedCountAndReset());
   EXPECT_TRUE(ShouldShowNotificationAsPopup(notifier_id));
 }