Remove GetExtensionService from Profile.

chrome/browser/extensions/api/extension_action/page_as_browser_action_apitest.cc

 // Copyright (c) 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 "base/command_line.h"
 #include "chrome/browser/extensions/browser_action_test_util.h"
 #include "chrome/browser/extensions/extension_action.h"
 #include "chrome/browser/extensions/extension_action_icon_factory.h"
 #include "chrome/browser/extensions/extension_action_manager.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_prefs.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/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/omnibox/location_bar.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 30 matching lines @@
   ASSERT_TRUE(RunExtensionTest("page_action/basics")) << message_;
   const Extension* extension = GetSingleLoadedExtension();
   ASSERT_TRUE(extension) << message_;
 
   // The extension declares a page action, but it should have gotten a browser
   // action instead.
   ASSERT_TRUE(extension_action_manager()->GetBrowserAction(*extension));
   ASSERT_FALSE(extension_action_manager()->GetPageAction(*extension));
 
   // With the "action box" there won't be browser actions unless they're pinned.
-  ExtensionPrefs* prefs =
-      browser()->profile()->GetExtensionService()->extension_prefs();
+  ExtensionPrefs* prefs = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service()->extension_prefs();
   prefs->SetBrowserActionVisibility(extension, true);
 
   // Test that there is a browser action in the toolbar.
   ASSERT_EQ(1, GetBrowserActionsBar().NumberOfBrowserActions());
 
   {
     // Tell the extension to update the page action state.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // Test that we received the changes.
   int tab_id = ExtensionTabUtil::GetTabId(
       chrome::GetActiveWebContents(browser()));
   ExtensionAction* action =
       extension_action_manager()->GetBrowserAction(*extension);
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
 
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
-    ExtensionService* service = browser()->profile()->GetExtensionService();
+    ExtensionService* service = extensions::ExtensionSystem::Get(
+        browser()->profile())->extension_service();
     service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 
   {
     // Tell the extension to update the page action state again.
     ResultCatcher catcher;
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("update2.html")));
     ASSERT_TRUE(catcher.GetNextResult());
@@ skipping 21 matching lines @@
       extension_action_manager()->GetBrowserAction(*extension);
   ASSERT_TRUE(page_action)
       << "Page action test extension should have a page action.";
 
   ASSERT_FALSE(page_action->HasPopup(tab_id));
 
   // Simulate the page action being clicked.  The resulting event should
   // install a page action popup.
   {
     ResultCatcher catcher;
-    ExtensionService* service = browser()->profile()->GetExtensionService();
+    ExtensionService* service = extensions::ExtensionSystem::Get(
+        browser()->profile())->extension_service();
     service->toolbar_model()->ExecuteBrowserAction(extension, browser(), NULL);
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   ASSERT_TRUE(page_action->HasPopup(tab_id))
       << "Clicking on the page action should have caused a popup to be added.";
 
   ASSERT_STREQ("/a_popup.html",
                page_action->GetPopupUrl(tab_id).path().c_str());
 
@@ skipping 49 matching lines @@
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }
 }  // namespace extensions