Cleanup many APIs to use ProfileKeyedAPI.

chrome/browser/extensions/activity_log/activity_log.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/activity_log/activity_log.h"
 
 #include <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/json/json_string_value_serializer.h"
+#include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_checker.h"
 #include "chrome/browser/extensions/activity_log/activity_action_constants.h"
 #include "chrome/browser/extensions/activity_log/counting_policy.h"
 #include "chrome/browser/extensions/activity_log/fullstream_ui_policy.h"
 #include "chrome/browser/extensions/api/activity_log_private/activity_log_private_api.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/install_tracker.h"
 #include "chrome/browser/extensions/install_tracker_factory.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
 #include "chrome/browser/prerender/prerender_manager.h"
 #include "chrome/browser/prerender/prerender_manager_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
-#include "components/browser_context_keyed_service/browser_context_dependency_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/web_contents.h"
 #include "extensions/browser/extension_system.h"
 #include "extensions/browser/extension_system_provider.h"
 #include "extensions/browser/extensions_browser_client.h"
 #include "extensions/common/extension.h"
 #include "third_party/re2/re2/re2.h"
 #include "url/gurl.h"
 
 #if !defined(OS_ANDROID)
@@ skipping 286 matching lines @@
   if (arg_url.is_valid()) {
     action->set_arg_incognito(arg_incognito);
     action->set_arg_url(arg_url);
   }
 }
 
 }  // namespace
 
 namespace extensions {
 
-// ActivityLogFactory
+// SET THINGS UP. --------------------------------------------------------------
 
-ActivityLogFactory* ActivityLogFactory::GetInstance() {
-  return Singleton<ActivityLogFactory>::get();
-}
+static base::LazyInstance<ProfileKeyedAPIFactory<ActivityLog> > g_factory =
+    LAZY_INSTANCE_INITIALIZER;
 
-BrowserContextKeyedService* ActivityLogFactory::BuildServiceInstanceFor(
-    content::BrowserContext* profile) const {
-  return new ActivityLog(static_cast<Profile*>(profile));
-}
-
-content::BrowserContext* ActivityLogFactory::GetBrowserContextToUse(
-    content::BrowserContext* context) const {
-  return ExtensionsBrowserClient::Get()->GetOriginalContext(context);

[James Cook, 2014/02/19 02:37:43]

I'll bet this is the way it is because there's some code in app_shell that
instantiates an ActivityLog but doesn't use it. If you convert this to a
ProfileKeyedAPI that uses chrome::GetBrowserContextRedirectedInIncognito()
you'll break this behavior. Maybe ProfileKeyedAPI should be converted to use
ExtensionsBrowserClient for these lookups?

[Yoyo Zhou, 2014/02/19 02:49:05]

Good call. But actually I think we don't use ActivityLog at all in app_shell.
I'll dig into why we changed this (I think it was to avoid references to
incognito?).

-}
-
-ActivityLogFactory::ActivityLogFactory()
-    : BrowserContextKeyedServiceFactory(
-        "ActivityLog",
-        BrowserContextDependencyManager::GetInstance()) {
-  DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
-  DependsOn(InstallTrackerFactory::GetInstance());
+ProfileKeyedAPIFactory<ActivityLog>* ActivityLog::GetFactoryInstance() {
+  return g_factory.Pointer();
 }
 
 // static
 ActivityLog* ActivityLog::GetInstance(content::BrowserContext* context) {
-  return ActivityLogFactory::GetForBrowserContext(context);
+  return ActivityLog::GetFactoryInstance()->GetForProfile(
+      Profile::FromBrowserContext(context));
 }
 
-ActivityLogFactory::~ActivityLogFactory() {
-}
-
-// ActivityLog
-
-// SET THINGS UP. --------------------------------------------------------------
-
 // Use GetInstance instead of directly creating an ActivityLog.
 ActivityLog::ActivityLog(Profile* profile)
     : database_policy_(NULL),
       database_policy_type_(ActivityLogPolicy::POLICY_INVALID),
       uma_policy_(NULL),
       profile_(profile),
       db_enabled_(false),
       testing_mode_(false),
       has_threads_(true),
       tracker_(NULL),
@@ skipping 324 matching lines @@
   urls.push_back(url);
   RemoveURLs(urls);
 }
 
 void ActivityLog::DeleteDatabase() {
   if (!database_policy_)
     return;
   database_policy_->DeleteDatabase();
 }
 
+template <>
+void ProfileKeyedAPIFactory<ActivityLog>::DeclareFactoryDependencies() {
+  DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
+  DependsOn(InstallTrackerFactory::GetInstance());
+}
+
 }  // namespace extensions