| Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
|
| diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
|
| index 696f617cb66c693835d345c250c04815244b225a..8f7bcb8f4ddb7b6fa0daa5a0d1d62386cc68b147 100644
|
| --- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
|
| +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
|
| @@ -14,9 +14,10 @@
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_test_message_listener.h"
|
| #include "chrome/browser/ui/browser.h"
|
| +#include "chrome/common/chrome_switches.h"
|
| +#include "chrome/test/base/ui_test_utils.h"
|
| #include "chromeos/dbus/bluetooth_out_of_band_client.h"
|
| #include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
|
| -#include "chrome/test/base/ui_test_utils.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| using extensions::Extension;
|
| @@ -29,10 +30,15 @@ namespace {
|
| static const char* kAdapterAddress = "A1:A2:A3:A4:A5:A6";
|
| static const char* kName = "whatsinaname";
|
|
|
| -class BluetoothApiTest : public PlatformAppApiTest {
|
| +class BluetoothApiTest : public ExtensionApiTest {
|
| public:
|
| BluetoothApiTest() : empty_extension_(utils::CreateEmptyExtension()) {}
|
|
|
| + virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
|
| + ExtensionApiTest::SetUpCommandLine(command_line);
|
| + command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis);
|
| + }
|
| +
|
| virtual void SetUpOnMainThread() OVERRIDE {
|
| // The browser will clean this up when it is torn down
|
| mock_adapter_ = new testing::StrictMock<chromeos::MockBluetoothAdapter>(
|
|
|