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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/extensions/app_process_apitest.cc

Issue 139943005: Convert extensions::ProcessMap to BrowserContextKeyedService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase process_map Created 6 years, 11 months 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
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/extension_crash_recovery_browsertest.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 65f0d20b244478bc3c0b337a0efd756d83342387..6d5df51048a412622d51518bd69b8d6d7d9777e0 100644
--- a/chrome/browser/extensions/app_process_apitest.cc
+++ b/chrome/browser/extensions/app_process_apitest.cc
@@ -69,8 +69,8 @@ class AppApiTest : public ExtensionApiTest {
void TestAppInstancesHelper(std::string app_name) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -146,8 +146,8 @@ class BlockedAppApiTest : public AppApiTest {
IN_PROC_BROWSER_TEST_F(AppApiTest, DISABLED_AppProcess) {
LOG(INFO) << "Start of test.";
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -294,7 +294,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_AppProcessBackgroundInstances) {
IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_BookmarkAppGetsNormalProcess) {
ExtensionService* service = extensions::ExtensionSystem::Get(
browser()->profile())->extension_service();
- extensions::ProcessMap* process_map = service->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -419,8 +420,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, AppProcessRedirectBack) {
// Fails on Windows. http://crbug.com/238670
// Added logging to help diagnose the location of the problem.
IN_PROC_BROWSER_TEST_F(AppApiTest, NavigateIntoAppProcess) {
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -466,8 +467,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, NavigateIntoAppProcess) {
// Added logging to help diagnose the location of the problem.
// http://crbug.com/238670
IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) {
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -531,8 +532,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcess) {
// Crashes on Windows and Mac. http://crbug.com/238670
// Added logging to help diagnose the location of the problem.
IN_PROC_BROWSER_TEST_F(AppApiTest, ReloadIntoAppProcessWithJavaScript) {
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -602,8 +603,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, OpenAppFromIframe) {
return;
#endif
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -752,8 +753,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, ClientRedirectToAppFromExtension) {
// 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 = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -790,8 +791,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 = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
@@ -832,8 +833,8 @@ IN_PROC_BROWSER_TEST_F(AppApiTest, MAYBE_ReloadAppAfterCrash) {
// BrowsingInstance, so that postMessage calls to the app's other windows still
// work.
IN_PROC_BROWSER_TEST_F(AppApiTest, SameBrowsingInstanceAfterSwap) {
- extensions::ProcessMap* process_map = extensions::ExtensionSystem::Get(
- browser()->profile())->extension_service()->process_map();
+ extensions::ProcessMap* process_map =
+ extensions::ProcessMap::Get(browser()->profile());
host_resolver()->AddRule("*", "127.0.0.1");
ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady());
« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/extensions/extension_crash_recovery_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698