Remove GetExtensionService from Profile.

chrome/browser/automation/testing_automation_provider.cc

 // Copyright 2012 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/automation/testing_automation_provider.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
@@ skipping 3676 matching lines @@
         "Missing or invalid 'path'");
     return;
   }
   if (!args->GetBoolean("with_ui", &with_ui)) {
     AutomationJSONReply(this, reply_message).SendError(
         "Missing or invalid 'with_ui'");
     return;
   }
   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) {
     // The observer will delete itself when done.
     new ExtensionReadyNotificationObserver(
         manager,
         service,
         this,
         reply_message);
 
@@ skipping 60 matching lines @@
 // output.
 void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
                                                   IPC::Message* reply_message) {
   AutomationJSONReply reply(this, reply_message);
   Browser* browser;
   std::string error_msg;
   if (!GetBrowserFromJSONArgs(args, &browser, &error_msg)) {
     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;
   }
   scoped_ptr<DictionaryValue> return_value(new DictionaryValue);
   ListValue* extensions_values = new ListValue;
   const ExtensionSet* extensions = service->extensions();
   const ExtensionSet* disabled_extensions = service->disabled_extensions();
   ExtensionList all;
   all.insert(all.end(),
@@ skipping 54 matching lines @@
   Browser* browser;
   if (!GetBrowserFromJSONArgs(args, &browser, &error)) {
     AutomationJSONReply(this, reply_message).SendError(error);
     return;
   }
   if (!GetExtensionFromJSONArgs(
           args, "id", browser->profile(), &extension, &error)) {
     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.");
     return;
   }
 
   // Wait for a notification indicating that the extension with the given ID
   // has been uninstalled.  This observer will delete itself.
   new ExtensionUninstallObserver(this, reply_message, extension->id());
   service->UninstallExtension(extension->id(), false, NULL);
@@ skipping 31 matching lines @@
     return;
   }
 
   if (allow_in_incognito && !enable) {
     AutomationJSONReply(this, reply_message)
         .SendError("Invalid state: Disabled extension "
                     "cannot be allowed in incognito mode.");
     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) {
     AutomationJSONReply(this, reply_message)
         .SendError("No extensions service or process manager.");
     return;
   }
 
   if (enable) {
     if (!service->IsExtensionEnabled(extension->id())) {
@@ skipping 195 matching lines @@
 // Sample json output: {}
 void TestingAutomationProvider::UpdateExtensionsNow(
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string error;
   Browser* browser;
   if (!GetBrowserFromJSONArgs(args, &browser, &error)) {
     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.");
     return;
   }
 
   extensions::ExtensionUpdater* updater = service->updater();
   if (!updater) {
     AutomationJSONReply(this, reply_message).SendError(
         "No updater for extensions service.");
@@ skipping 876 matching lines @@
     Browser* browser,
     DictionaryValue* args,
     IPC::Message* reply_message) {
   std::string id;
   if (!args->GetString("id", &id)) {
     AutomationJSONReply(this, reply_message).SendError(
         "Must include string id.");
     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.");
     return;
   }
 
   const Extension* extension = service->GetExtensionById(
       id, false  /* do not include disabled extensions */);
   if (!extension) {
     AutomationJSONReply(this, reply_message).SendError(
@@ skipping 37 matching lines @@
     reply.SendError("Must include string id.");
     return;
   }
 
   std::string launch_type_str;
   if (!args->GetString("launch_type", &launch_type_str)) {
     reply.SendError("Must specify app launch type.");
     return;
   }
 
-  ExtensionService* service = browser->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser->profile())->extension_service();
   if (!service) {
     reply.SendError("No extensions service.");
     return;
   }
 
   const Extension* extension = service->GetExtensionById(
       id, true  /* include disabled extensions */);
   if (!extension) {
     reply.SendError(
         StringPrintf("Extension with ID '%s' doesn't exist.", id.c_str()));
@@ skipping 1264 matching lines @@
   if (g_browser_process)
     g_browser_process->GetAutomationProviderList()->RemoveProvider(this);
 }
 
 void TestingAutomationProvider::EnsureTabSelected(Browser* browser,
                                                   WebContents* tab) {
   TabStripModel* tab_strip = browser->tab_strip_model();
   if (tab_strip->GetActiveWebContents() != tab)
     tab_strip->ActivateTabAt(tab_strip->GetIndexOfWebContents(tab), true);
 }