Removed InProcessBrowserTest::CleanUpOnMainThread()

chrome/browser/chromeos/power/peripheral_battery_observer_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 "chrome/browser/chromeos/power/peripheral_battery_observer.h"
 
 #include "base/command_line.h"
 #include "base/message_loop/message_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
@@ skipping 28 matching lines @@
         new FakeDBusThreadManager;
     fake_dbus_thread_manager->SetFakeClients();
     DBusThreadManager::SetInstanceForTesting(fake_dbus_thread_manager);
     InProcessBrowserTest::SetUpInProcessBrowserTestFixture();
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
     observer_.reset(new PeripheralBatteryObserver());
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     observer_.reset();
   }
 
   virtual void TearDownInProcessBrowserTestFixture() OVERRIDE {
     InProcessBrowserTest::TearDownInProcessBrowserTestFixture();
   }
 
  protected:
   scoped_ptr<PeripheralBatteryObserver> observer_;
 
@@ skipping 87 matching lines @@
   observer_->PeripheralBatteryStatusReceived(kTestBatteryPath,
                                              kTestDeviceName, 5);
   EXPECT_EQ(observer_->batteries_.count(kTestBatteryAddress), 1u);
   EXPECT_TRUE(notification_manager->FindById(kTestBatteryAddress) != NULL);
 
   observer_->RemoveBattery(kTestBatteryAddress);
   EXPECT_FALSE(notification_manager->FindById(kTestBatteryAddress) != NULL);
 }
 
 }  // namespace chromeos