Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1569)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/app_process_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/app_notification_browsertest.cc ('k') | chrome/browser/extensions/browser_action_apitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/app_process_apitest.cc
diff --git a/chrome/browser/extensions/app_process_apitest.cc b/chrome/browser/extensions/app_process_apitest.cc
index 3161bd939492cd37fa6f98f5c57fb820ff5b4619..d6a68aaae67b9a4ad7b9386defd93291015382c8 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -5,6 +5,7 @@
#include "chrome/browser/extensions/extension_apitest.h"
#include "chrome/browser/extensions/extension_host.h"
#include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/process_map.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/ui/blocked_content/blocked_content_tab_helper.h"
@@ -63,8 +64,8 @@ class AppApiTest : public ExtensionApiTest {
void TestAppInstancesHelper(std::string app_name) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -134,8 +135,8 @@ class BlockedAppApiTest : public AppApiTest {
IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcess) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -249,7 +250,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessBackgroundInstances) {
// Tests that bookmark apps do not use the app process model and are treated
// like normal web pages instead. http://crbug.com/104636.
IN_PROC_BROWSER_TEST_F(AppApiTest, BookmarkAppGetsNormalProcess) {
- ExtensionService* service = browser()->profile()->GetExtensionService();
+ ExtensionService* service = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service();
extensions::ProcessMap* process_map = service->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
@@ -368,8 +370,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
#define MAYBE_ReloadIntoAppProcess ReloadIntoAppProcess
#endif
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -451,8 +453,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadIntoAppProcess) {
// empty.html) results in the new window being in an app process. See
// http://crbug.com/89272 for more details.
IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -562,8 +564,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromExtension) {
// missing special permissions and should be scriptable from the iframe.
// See http://crbug.com/92669 for more details.
IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
@@ -600,8 +602,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenWebPopupFromWebIframe) {
#define MAYBE_ReloadAppAfterCrash ReloadAppAfterCrash
#endif
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
- extensions::ProcessMap* process_map =
- browser()->profile()->GetExtensionService()->process_map();
+ extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
+ browser()->profile())->extension_service()->process_map();
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(test_server()->Start());
« chrome/browser/chrome_content_browser_client.cc ('K') | « chrome/browser/extensions/app_notification_browsertest.cc ('k') | chrome/browser/extensions/browser_action_apitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698