extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc - Issue 569493003: Remove CreateEmptyExtension from extension_function_test_utils

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

Issue 569493003: Remove CreateEmptyExtension from extension_function_test_utils (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rebase Created 6 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « extensions/browser/api/bluetooth_low_energy/bluetooth_low_energy_apitest.cc ('k') | extensions/browser/api/cast_channel/cast_channel_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

diff --git a/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc b/extensions/browser/api/bluetooth_socket/bluetooth_socket_apitest.cc

index bb5d8d0bf243067dbcb0893bdc46c93a5251d41c..6cc42cce69544ff4eb350cf670f93152d1248018 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();

}