chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc - Issue 11365181: Remove GetExtensionService from Profile.

Unified Diff: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

Issue 11365181: Remove GetExtensionService from Profile. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: tweaks Created 8 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/extensions/api/preference/preference_api.cc ('k') | chrome/browser/extensions/api/web_request/web_request_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

diff --git a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

index 38a06796d55b2bfda64ed5d17b679dc0ef83e110..5bb6358e73c8d010e14a2241c178dc85e8655671 100644

--- a/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

+++ b/chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc

@@ -17,6 +17,7 @@

#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"

@@ -485,7 +486,8 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, UserAction) {

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");

@@ -518,7 +520,8 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, RequestOpenTab) {

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");

@@ -610,7 +613,8 @@ 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);

@@ -629,7 +633,8 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcess) {

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);

@@ -659,7 +664,8 @@ IN_PROC_BROWSER_TEST_F(WebNavigationApiTest, CrossProcessFragment) {

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);