Remove CreateEmptyExtension from extension_function_test_utils

extensions/browser/api/bluetooth_socket/bluetooth_socket_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 <string>
 
 #include "base/memory/ref_counted.h"
 #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_service.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
 #include "device/bluetooth/test/mock_bluetooth_device.h"
 #include "device/bluetooth/test/mock_bluetooth_socket.h"
 #include "extensions/browser/api/bluetooth_socket/bluetooth_socket_api.h"
+#include "extensions/common/test_util.h"
 #include "extensions/test/result_catcher.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 using device::BluetoothAdapter;
 using device::BluetoothAdapterFactory;
 using device::BluetoothDevice;
 using device::BluetoothSocket;
 using device::BluetoothUUID;
 using device::MockBluetoothAdapter;
 using device::MockBluetoothDevice;
 using device::MockBluetoothSocket;
 using extensions::Extension;
 using extensions::ResultCatcher;
 
-namespace utils = extension_function_test_utils;
 namespace api = extensions::core_api;
 
 namespace {
 
 class BluetoothSocketApiTest : public ExtensionApiTest {
  public:
   BluetoothSocketApiTest() {}
 
   virtual void SetUpOnMainThread() OVERRIDE {
     ExtensionApiTest::SetUpOnMainThread();
-    empty_extension_ = utils::CreateEmptyExtension();
+    empty_extension_ = extensions::test_util::CreateEmptyExtension();
     SetUpMockAdapter();
   }
 
   void SetUpMockAdapter() {
     // The browser will clean this up when it is torn down.
     mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>();
     BluetoothAdapterFactory::SetAdapterForTesting(mock_adapter_);
 
     mock_device1_.reset(
         new testing::NiceMock<MockBluetoothDevice>(mock_adapter_.get(),
@@ skipping 155 matching lines @@
   catcher.RestrictToBrowserContext(browser()->profile());
 
   // Run the test.
   scoped_refptr<const Extension> extension(
       LoadExtension(test_data_dir_.AppendASCII(
           "bluetooth_socket/permission_denied")));
   ASSERT_TRUE(extension.get());
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }