Remove GetExtensionService from Profile.

chrome/browser/extensions/api/extension_action/page_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 "chrome/browser/extensions/browser_event_router.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_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/sessions/session_tab_helper.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/extensions/extension.h"
 #include "chrome/test/base/ui_test_utils.h"
@@ skipping 28 matching lines @@
       chrome::GetActiveWebContents(browser()))->session_id().id();
   ExtensionAction* action = GetPageAction(*extension);
   ASSERT_TRUE(action);
   EXPECT_EQ("Modified", action->GetTitle(tab_id));
 
   {
     // Simulate the page action being clicked.
     ResultCatcher catcher;
     int tab_id =
         ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
-    ExtensionService* service = browser()->profile()->GetExtensionService();
+    ExtensionService* service = extensions::ExtensionSystem::Get(
+        browser()->profile())->extension_service();
     service->browser_event_router()->PageActionExecuted(
         browser()->profile(), *action, tab_id, "", 0);
     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")));
@@ skipping 23 matching lines @@
   ExtensionAction* page_action = GetPageAction(*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->browser_event_router()->PageActionExecuted(
         browser()->profile(), *page_action, tab_id, "", 1);
     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 57 matching lines @@
     ui_test_utils::NavigateToURL(browser(),
         GURL(extension->GetResourceURL("page.html")));
     ASSERT_TRUE(catcher.GetNextResult());
   }
 
   // Simulate the page action being clicked.
   {
     ResultCatcher catcher;
     int tab_id =
         ExtensionTabUtil::GetTabId(chrome::GetActiveWebContents(browser()));
-    ExtensionService* service = browser()->profile()->GetExtensionService();
+    ExtensionService* service = extensions::ExtensionSystem::Get(
+        browser()->profile())->extension_service();
     ExtensionAction* page_action = GetPageAction(*extension);
     service->browser_event_router()->PageActionExecuted(
         browser()->profile(), *page_action, tab_id, "", 1);
     EXPECT_TRUE(catcher.GetNextResult());
   }
 }
 
 // Tests popups in page actions.
 // Flaky on the trybots. See http://crbug.com/96725.
 IN_PROC_BROWSER_TEST_F(PageActionApiTest, DISABLED_ShowPageActionPopup) {
@@ skipping 31 matching lines @@
   ASSERT_TRUE(extension) << message_;
 
   ResultCatcher catcher;
   ui_test_utils::NavigateToURL(browser(),
       GURL(extension->GetResourceURL("update.html")));
   ASSERT_TRUE(catcher.GetNextResult());
 }
 
 }  // namespace
 }  // namespace extensions