diff options
| author | limasdf <limasdf@gmail.com> | 2014-09-18 13:17:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-18 20:17:48 +0000 |
| commit | f0dcf2f802455adebc73eca469d222d18e5560f9 (patch) | |
| tree | df941f2f09e9dc519bd4e543e0da5e6890aa7c40 /extensions/browser/api/bluetooth_socket | |
| parent | 291fd86a7aabd22fb27409a56b34055e02ee0c62 (diff) | |
| download | chromium_src-f0dcf2f802455adebc73eca469d222d18e5560f9.zip chromium_src-f0dcf2f802455adebc73eca469d222d18e5560f9.tar.gz chromium_src-f0dcf2f802455adebc73eca469d222d18e5560f9.tar.bz2 | |
Remove CreateEmptyExtension from extension_function_test_utils
because "extensions/common/test_util.h" has duplicate function.
BUG=394840
Review URL: https://codereview.chromium.org/569493003
Cr-Commit-Position: refs/heads/master@{#295541}
Diffstat (limited to 'extensions/browser/api/bluetooth_socket')
| -rw-r--r-- | extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc index bb5d8d0..6cc42cc 100644 --- a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc +++ b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc @@ -7,7 +7,6 @@ #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" @@ -18,6 +17,7 @@ #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" @@ -32,7 +32,6 @@ using device::MockBluetoothSocket; using extensions::Extension; using extensions::ResultCatcher; -namespace utils = extension_function_test_utils; namespace api = extensions::core_api; namespace { @@ -43,7 +42,7 @@ class BluetoothSocketApiTest : public ExtensionApiTest { virtual void SetUpOnMainThread() OVERRIDE { ExtensionApiTest::SetUpOnMainThread(); - empty_extension_ = utils::CreateEmptyExtension(); + empty_extension_ = extensions::test_util::CreateEmptyExtension(); SetUpMockAdapter(); } |