Remove GetExtensionService from Profile.

chrome/browser/extensions/api/web_navigation/web_navigation_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 <list>
 #include <set>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/stringprintf.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_browser_main.h"
 #include "chrome/browser/chrome_browser_main_extra_parts.h"
 #include "chrome/browser/chrome_content_browser_client.h"
 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.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/profiles/profile.h"
 #include "chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.h"
 #include "chrome/browser/tab_contents/render_view_context_menu.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_process_host.h"
@@ skipping 448 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, UserAction) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_userAction.html")) << message_;
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
   content::WaitForLoadStop(tab);
 
   ResultCatcher catcher;
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id_, false);
   GURL url = extension->GetResourceURL("userAction/a.html");
 
   ui_test_utils::NavigateToURL(browser(), url);
 
   // This corresponds to "Open link in new tab".
   content::ContextMenuParams params;
   params.is_editable = false;
   params.media_type = WebKit::WebContextMenuData::MediaTypeNone;
@@ skipping 12 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, RequestOpenTab) {
   // Wait for the extension to set itself up and return control to us.
   ASSERT_TRUE(RunExtensionSubtest("webnavigation", "test_requestOpenTab.html"))
       << message_;
 
   WebContents* tab = chrome::GetActiveWebContents(browser());
   content::WaitForLoadStop(tab);
 
   ResultCatcher catcher;
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id_, false);
   GURL url = extension->GetResourceURL("requestOpenTab/a.html");
 
   ui_test_utils::NavigateToURL(browser(), url);
 
   // There's a link on a.html. Middle-click on it to open it in a new tab.
   WebKit::WebMouseEvent mouse_event;
   mouse_event.type = WebKit::WebInputEvent::MouseDown;
   mouse_event.button = WebKit::WebMouseEvent::ButtonMiddle;
@@ skipping 71 matching lines @@
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, History) {
   ASSERT_TRUE(
       RunExtensionSubtest("webnavigation", "test_history.html"))
           << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) {
   LoadExtension(test_data_dir_.AppendASCII("webnavigation").AppendASCII("app"));
   LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id_, false);
 
   // See crossProcess/d.html.
   DelayLoadStartAndExecuteJavascript call_script(
       test_navigation_listener(),
       test_server()->GetURL("test1"),
       "navigate2()",
       extension->GetResourceURL("crossProcess/empty.html"));
 
   ASSERT_TRUE(RunPageTest(
       extension->GetResourceURL("test_crossProcess.html").spec()))
           << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) {
   LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id_, false);
 
   // See crossProcess/f.html.
   DelayLoadStartAndExecuteJavascript call_script3(
       test_navigation_listener(),
       test_server()->GetURL("test3"),
       "updateFragment()",
       extension->GetResourceURL(base::StringPrintf(
           "crossProcess/f.html?%d#foo",
           test_server()->host_port_pair().port())));
 
   // See crossProcess/g.html.
   DelayLoadStartAndExecuteJavascript call_script4(
       test_navigation_listener(),
       test_server()->GetURL("test4"),
       "updateFragment()",
       extension->GetResourceURL(base::StringPrintf(
           "crossProcess/g.html?%d#foo",
           test_server()->host_port_pair().port())));
 
   ASSERT_TRUE(RunPageTest(
       extension->GetResourceURL("test_crossProcessFragment.html").spec()))
           << message_;
 }
 
 IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessHistory) {
   LoadExtension(test_data_dir_.AppendASCII("webnavigation"));
 
-  ExtensionService* service = browser()->profile()->GetExtensionService();
+  ExtensionService* service = extensions::ExtensionSystem::Get(
+      browser()->profile())->extension_service();
   const extensions::Extension* extension =
       service->GetExtensionById(last_loaded_extension_id_, false);
 
   // See crossProcess/e.html.
   DelayLoadStartAndExecuteJavascript call_script2(
       test_navigation_listener(),
       test_server()->GetURL("test2"),
       "updateHistory()",
       extension->GetResourceURL("crossProcess/empty.html"));
 
@@ skipping 10 matching lines @@
       test_server()->GetURL("test6"),
       "updateHistory()",
       extension->GetResourceURL("crossProcess/empty.html"));
 
   ASSERT_TRUE(RunPageTest(
       extension->GetResourceURL("test_crossProcessHistory.html").spec()))
           << message_;
 }
 
 }  // namespace extensions