Relands "Removed InProcessBrowserTest::CleanUpOnMainThread()"

chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc

 // Copyright 2014 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/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
 #include "chrome/browser/extensions/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ skipping 83 matching lines @@
   BluetoothLowEnergyApiTest() {}
 
   virtual ~BluetoothLowEnergyApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
     empty_extension_ = utils::CreateEmptyExtension();
     SetUpMocks();
   }
 
-  virtual void CleanUpOnMainThread() OVERRIDE {
+  virtual void TearDownOnMainThread() OVERRIDE {
     EXPECT_CALL(*mock_adapter_, RemoveObserver(_));
   }
 
   void SetUpMocks() {
     mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>();
     EXPECT_CALL(*mock_adapter_, GetDevices())
         .WillOnce(Return(BluetoothAdapter::ConstDeviceList()));
 
     event_router()->SetAdapterForTesting(mock_adapter_);
 
@@ skipping 1158 matching lines @@
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->GattCharacteristicRemoved(service1_.get(), chrc2_.get());
   event_router()->GattCharacteristicRemoved(service0_.get(), chrc1_.get());
   event_router()->GattCharacteristicRemoved(service0_.get(), chrc0_.get());
   event_router()->GattServiceRemoved(device0_.get(), service1_.get());
   event_router()->GattServiceRemoved(device0_.get(), service0_.get());
   event_router()->DeviceRemoved(mock_adapter_, device0_.get());
 }
 
 }  // namespace