Remove GetExtensionService calls and replace with PKSF calls through the ExtensionSystem. Extension services were made into ProfileKeyedServices a while ago; this replaces the deprecated calls that ran directly through the Profile object.

This is about half of the total GetExtensionService calls in the codebase, but this CL is already ridiculously large.

BUG= http://code.google.com/p/chromium/issues/detail?id=104095


Review URL: https://chromiumcodereview.appspot.com/11365181

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170497 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 22 insertions, 10 deletions

diff --git a/chrome/browser/automation/automation_provider_json.cc b/chrome/browser/automation/automation_provider_json.cc
index 6b27e46..6684b48 100644
--- a/chrome/browser/automation/automation_provider_json.cc
+++ b/chrome/browser/automation/automation_provider_json.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/automation/automation_provider.h"
 #include "chrome/browser/automation/automation_util.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/automation_id.h"
 #include "chrome/common/automation_messages.h"
@@ -189,7 +190,8 @@ bool GetExtensionFromJSONArgsHelper(
     *error = base::StringPrintf("Missing or invalid key: %s", key.c_str());
     return false;
   }
-  ExtensionService* service = profile->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+      extension_service();
   if (!service) {
     *error = "No extensions service.";
     return false;
diff --git a/chrome/browser/automation/automation_provider_observers.cc b/chrome/browser/automation/automation_provider_observers.cc
index c137183..50c5bfc 100644
--- a/chrome/browser/automation/automation_provider_observers.cc
+++ b/chrome/browser/automation/automation_provider_observers.cc
@@ -34,6 +34,7 @@
 #include "chrome/browser/extensions/extension_host.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/history/history_types.h"
 #include "chrome/browser/history/top_sites.h"
@@ -1918,7 +1919,8 @@ NTPInfoObserver::NTPInfoObserver(AutomationProvider* automation,
   }
 
   // Collect information about the apps in the new tab page.
-  ExtensionService* ext_service = automation_->profile()->GetExtensionService();
+  ExtensionService* ext_service = extensions::ExtensionSystem::Get(
+      automation_->profile())->extension_service();
   if (!ext_service) {
     AutomationJSONReply(automation_, reply_message_.release())
         .SendError("No ExtensionService.");
diff --git a/chrome/browser/automation/automation_util.cc b/chrome/browser/automation/automation_util.cc
index 144f15b..2e80ada 100644
--- a/chrome/browser/automation/automation_util.cc
+++ b/chrome/browser/automation/automation_util.cc
@@ -597,7 +597,8 @@ bool GetExtensionForId(
     const extensions::Extension** extension) {
   if (id.type() != AutomationId::kTypeExtension)
     return false;
-  ExtensionService* service = profile->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(profile)->
+      extension_service();
   const extensions::Extension* installed_extension =
       service->GetInstalledExtension(id.id());
   if (installed_extension)
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
index 47036a3..5e3f044 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -3694,7 +3694,8 @@ void TestingAutomationProvider::InstallExtension(
   }
   args->GetBoolean("from_webstore", &from_webstore);
 
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   ExtensionProcessManager* manager =
       extensions::ExtensionSystem::Get(browser->profile())->process_manager();
   if (service && manager) {
@@ -3775,7 +3776,8 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
     reply.SendError(error_msg);
     return;
   }
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     reply.SendError("No extensions service.");
     return;
@@ -3850,7 +3852,8 @@ void TestingAutomationProvider::UninstallExtensionById(
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     AutomationJSONReply(this, reply_message).SendError(
         "No extensions service.");
@@ -3902,7 +3905,8 @@ void TestingAutomationProvider::SetExtensionStateById(
     return;
   }
 
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   ExtensionProcessManager* manager =
       extensions::ExtensionSystem::Get(browser->profile())->process_manager();
   if (!service) {
@@ -4118,7 +4122,8 @@ void TestingAutomationProvider::UpdateExtensionsNow(
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     AutomationJSONReply(this, reply_message).SendError(
         "No extensions service.");
@@ -5015,7 +5020,8 @@ void TestingAutomationProvider::LaunchApp(
     return;
   }
 
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     AutomationJSONReply(this, reply_message).SendError(
         "No extensions service.");
@@ -5073,7 +5079,8 @@ void TestingAutomationProvider::SetAppLaunchType(
     return;
   }
 
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     reply.SendError("No extensions service.");
     return;