Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
index 63828ff93c40e4901696867369e9e06dd2cc9a11..5b00e8b5ca0d70294273e8d955e694e2faba1f3b 100644 |
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest.cc |
@@ -27,10 +27,10 @@ using device::BluetoothDevice; |
using device::BluetoothOutOfBandPairingData; |
using device::MockBluetoothAdapter; |
using device::MockBluetoothDevice; |
-using extensions::Extension; |
namespace utils = extension_function_test_utils; |
-namespace api = extensions::api; |
+ |
+namespace extensions { |
namespace { |
@@ -47,11 +47,13 @@ class BluetoothApiTest : public ExtensionApiTest { |
} |
virtual void SetUpOnMainThread() OVERRIDE { |
+ ExtensionApiTest::SetUpOnMainThread(); |
SetUpMockAdapter(); |
} |
virtual void CleanUpOnMainThread() OVERRIDE { |
EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)); |
+ ExtensionApiTest::CleanUpOnMainThread(); |
} |
void SetUpMockAdapter() { |
@@ -80,9 +82,8 @@ class BluetoothApiTest : public ExtensionApiTest { |
scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device1_; |
scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device2_; |
- extensions::ExtensionBluetoothEventRouter* event_router() { |
- return extensions::BluetoothAPI::Get(browser()->profile()) |
- ->bluetooth_event_router(); |
+ ExtensionBluetoothEventRouter* event_router() { |
+ return BluetoothAPI::Get(browser()->profile())->bluetooth_event_router(); |
} |
private: |
@@ -479,3 +480,5 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Permissions) { |
EXPECT_TRUE(RunExtensionTest("bluetooth/permissions")) << message_; |
} |
+ |
+} // namespace extensions |