| Index: chrome/browser/extensions/api/bluetooth/bluetooth_api.h
|
| diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
|
| index 552b7dc3402c338749378c6783ea593c38673838..a4b7b21a2f145b0944b84f29d696afd54f6fb40e 100644
|
| --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
|
| +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h
|
| @@ -10,10 +10,10 @@
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/extensions/api/bluetooth/bluetooth_extension_function.h"
|
| -#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
|
| #include "device/bluetooth/bluetooth_device.h"
|
| #include "device/bluetooth/bluetooth_profile.h"
|
| #include "extensions/browser/api/async_api_function.h"
|
| +#include "extensions/browser/browser_context_keyed_api_factory.h"
|
| #include "extensions/browser/event_router.h"
|
| #include "extensions/browser/extension_function.h"
|
|
|
| @@ -35,12 +35,13 @@ namespace extensions {
|
| class ExtensionBluetoothEventRouter;
|
|
|
| // The profile-keyed service that manages the bluetooth extension API.
|
| -class BluetoothAPI : public ProfileKeyedAPI, public EventRouter::Observer {
|
| +class BluetoothAPI : public BrowserContextKeyedAPI,
|
| + public EventRouter::Observer {
|
| public:
|
| // Convenience method to get the BluetoothAPI for a profile.
|
| static BluetoothAPI* Get(content::BrowserContext* context);
|
|
|
| - static ProfileKeyedAPIFactory<BluetoothAPI>* GetFactoryInstance();
|
| + static BrowserContextKeyedAPIFactory<BluetoothAPI>* GetFactoryInstance();
|
|
|
| explicit BluetoothAPI(content::BrowserContext* context);
|
| virtual ~BluetoothAPI();
|
| @@ -55,9 +56,9 @@ class BluetoothAPI : public ProfileKeyedAPI, public EventRouter::Observer {
|
| virtual void OnListenerRemoved(const EventListenerInfo& details) OVERRIDE;
|
|
|
| private:
|
| - friend class ProfileKeyedAPIFactory<BluetoothAPI>;
|
| + friend class BrowserContextKeyedAPIFactory<BluetoothAPI>;
|
|
|
| - // ProfileKeyedAPI implementation.
|
| + // BrowserContextKeyedAPI implementation.
|
| static const char* service_name() { return "BluetoothAPI"; }
|
| static const bool kServiceRedirectedInIncognito = true;
|
| static const bool kServiceIsNULLWhileTesting = true;
|
|
|