Index: chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h |
diff --git a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h |
index e0bbb35dc62b6ac6edcd837dfc4bc8876044e4bc..513d015bc4b284fd9b0f40ad01ee5b342f4578c2 100644 |
--- a/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h |
+++ b/chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h |
@@ -12,8 +12,8 @@ |
#include "base/synchronization/lock.h" |
#include "chrome/browser/extensions/activity_log/activity_actions.h" |
#include "chrome/browser/extensions/activity_log/activity_log.h" |
-#include "chrome/browser/extensions/api/profile_keyed_api_factory.h" |
#include "chrome/browser/extensions/chrome_extension_function.h" |
+#include "extensions/browser/browser_context_keyed_api_factory.h" |
#include "extensions/browser/event_router.h" |
namespace extensions { |
@@ -21,15 +21,15 @@ namespace extensions { |
class ActivityLog; |
// Handles interactions between the Activity Log API and implementation. |
-class ActivityLogAPI : public ProfileKeyedAPI, |
+class ActivityLogAPI : public BrowserContextKeyedAPI, |
public extensions::ActivityLog::Observer, |
public EventRouter::Observer { |
public: |
explicit ActivityLogAPI(content::BrowserContext* context); |
virtual ~ActivityLogAPI(); |
- // ProfileKeyedAPI implementation. |
- static ProfileKeyedAPIFactory<ActivityLogAPI>* GetFactoryInstance(); |
+ // BrowserContextKeyedAPI implementation. |
+ static BrowserContextKeyedAPIFactory<ActivityLogAPI>* GetFactoryInstance(); |
virtual void Shutdown() OVERRIDE; |
@@ -37,7 +37,7 @@ class ActivityLogAPI : public ProfileKeyedAPI, |
static bool IsExtensionWhitelisted(const std::string& extension_id); |
private: |
- friend class ProfileKeyedAPIFactory<ActivityLogAPI>; |
+ friend class BrowserContextKeyedAPIFactory<ActivityLogAPI>; |
static const char* service_name() { return "ActivityLogPrivateAPI"; } |
// ActivityLog::Observer |
@@ -56,8 +56,9 @@ class ActivityLogAPI : public ProfileKeyedAPI, |
DISALLOW_COPY_AND_ASSIGN(ActivityLogAPI); |
}; |
-template<> |
-void ProfileKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies(); |
+template <> |
+void |
+ BrowserContextKeyedAPIFactory<ActivityLogAPI>::DeclareFactoryDependencies(); |
// The implementation of activityLogPrivate.getExtensionActivities |
class ActivityLogPrivateGetExtensionActivitiesFunction |