Remove CreateEmptyExtension from extension_function_test_utils

extensions/browser/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/extension_apitest.h"
-#include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_characteristic.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_connection.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_descriptor.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_notify_session.h"
 #include "device/bluetooth/test/mock_bluetooth_gatt_service.h"
 #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_api.h"
 #include "extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_event_router.h"
+#include "extensions/common/test_util.h"
 #include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using device::BluetoothUUID;
 using device::BluetoothAdapter;
 using device::BluetoothDevice;
 using device::BluetoothGattCharacteristic;
 using device::BluetoothGattConnection;
 using device::BluetoothGattDescriptor;
 using device::BluetoothGattService;
 using device::BluetoothGattNotifySession;
 using device::MockBluetoothAdapter;
 using device::MockBluetoothDevice;
 using device::MockBluetoothGattCharacteristic;
 using device::MockBluetoothGattConnection;
 using device::MockBluetoothGattDescriptor;
 using device::MockBluetoothGattService;
 using device::MockBluetoothGattNotifySession;
 using extensions::BluetoothLowEnergyEventRouter;
 using extensions::ResultCatcher;
 using testing::Invoke;
 using testing::Return;
 using testing::ReturnRef;
 using testing::ReturnRefOfCopy;
 using testing::SaveArg;
 using testing::_;
 
-namespace utils = extension_function_test_utils;
-
 namespace {
 
 // Test service constants.
 const char kTestLeDeviceAddress0[] = "11:22:33:44:55:66";
 const char kTestLeDeviceName0[] = "Test LE Device 0";
 
 const char kTestLeDeviceAddress1[] = "77:88:99:AA:BB:CC";
 const char kTestLeDeviceName1[] = "Test LE Device 1";
 
 const char kTestServiceId0[] = "service_id0";
@@ skipping 35 matching lines @@
 const uint8 kTestDescriptorDefaultValue1[] = {0x04, 0x05};
 
 class BluetoothLowEnergyApiTest : public ExtensionApiTest {
  public:
   BluetoothLowEnergyApiTest() {}
 
   virtual ~BluetoothLowEnergyApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
-    empty_extension_ = utils::CreateEmptyExtension();
+    empty_extension_ = extensions::test_util::CreateEmptyExtension();
     SetUpMocks();
   }
 
   virtual void TearDownOnMainThread() OVERRIDE {
     EXPECT_CALL(*mock_adapter_, RemoveObserver(_));
   }
 
   void SetUpMocks() {
     mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>();
     EXPECT_CALL(*mock_adapter_, GetDevices())
@@ skipping 1042 matching lines @@
       .Times(2)
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           first_conn))
       .WillOnce(InvokeCallbackWithScopedPtrArg<0, BluetoothGattConnection>(
           CreateGattConnection(kTestLeDeviceAddress0,
                                false /* expect_disconnect */)));
 
   ASSERT_TRUE(LoadExtension(test_data_dir_.AppendASCII(
       "bluetooth_low_energy/reconnect_after_disconnected")));
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, ConnectInProgress) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   EXPECT_CALL(*mock_adapter_, GetDevice(kTestLeDeviceAddress0))
       .WillRepeatedly(Return(device0_.get()));
 
   BluetoothDevice::GattConnectionCallback connect_callback;
@@ skipping 16 matching lines @@
       "bluetooth_low_energy/connect_in_progress")));
 
   listener.WaitUntilSatisfied();
   connect_callback.Run(conn_ptr.Pass());
 
   listener.Reset();
   listener.WaitUntilSatisfied();
   disconnect_callback.Run();
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothLowEnergyApiTest, StartStopNotifications) {
   ResultCatcher catcher;
   catcher.RestrictToBrowserContext(browser()->profile());
 
   event_router()->GattServiceAdded(
       mock_adapter_, device0_.get(), service0_.get());
   event_router()->GattServiceAdded(
       mock_adapter_, device0_.get(), service1_.get());
@@ skipping 60 matching lines @@
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc2_.get());
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc1_.get());
   event_router()->GattCharacteristicRemoved(mock_adapter_, chrc0_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service1_.get());
   event_router()->GattServiceRemoved(
       mock_adapter_, device0_.get(), service0_.get());
 }
 
 }  // namespace