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

Side by Side Diff: chrome/browser/extensions/isolated_app_browsertest.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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/strings/stringprintf.h" 5 #include "base/strings/stringprintf.h"
6 #include "base/strings/utf_string_conversions.h" 6 #include "base/strings/utf_string_conversions.h"
7 #include "chrome/browser/automation/automation_util.h" 7 #include "chrome/browser/automation/automation_util.h"
8 #include "chrome/browser/extensions/extension_apitest.h" 8 #include "chrome/browser/extensions/extension_apitest.h"
9 #include "chrome/browser/extensions/extension_host.h" 9 #include "chrome/browser/extensions/extension_host.h"
10 #include "chrome/browser/extensions/extension_service.h" 10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/browser.h" 12 #include "chrome/browser/ui/browser.h"
13 #include "chrome/browser/ui/browser_commands.h" 13 #include "chrome/browser/ui/browser_commands.h"
14 #include "chrome/browser/ui/tabs/tab_strip_model.h" 14 #include "chrome/browser/ui/tabs/tab_strip_model.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "chrome/test/base/ui_test_utils.h" 16 #include "chrome/test/base/ui_test_utils.h"
17 #include "content/public/browser/render_process_host.h" 17 #include "content/public/browser/render_process_host.h"
18 #include "content/public/browser/render_view_host.h" 18 #include "content/public/browser/render_view_host.h"
19 #include "content/public/browser/site_instance.h" 19 #include "content/public/browser/site_instance.h"
20 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
21 #include "content/public/test/browser_test_utils.h" 21 #include "content/public/test/browser_test_utils.h"
22 #include "extensions/browser/process_map.h"
22 #include "extensions/common/switches.h" 23 #include "extensions/common/switches.h"
23 #include "net/dns/mock_host_resolver.h" 24 #include "net/dns/mock_host_resolver.h"
24 #include "net/test/embedded_test_server/embedded_test_server.h" 25 #include "net/test/embedded_test_server/embedded_test_server.h"
25 #include "net/test/embedded_test_server/http_response.h" 26 #include "net/test/embedded_test_server/http_response.h"
26 #include "net/test/embedded_test_server/http_request.h" 27 #include "net/test/embedded_test_server/http_request.h"
27 28
28 using content::ExecuteScript; 29 using content::ExecuteScript;
29 using content::ExecuteScriptAndExtractString; 30 using content::ExecuteScriptAndExtractString;
30 using content::NavigationController; 31 using content::NavigationController;
31 using content::WebContents; 32 using content::WebContents;
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
107 return actual_cookie.find(cookie) != std::string::npos; 108 return actual_cookie.find(cookie) != std::string::npos;
108 } 109 }
109 110
110 const extensions::Extension* GetInstalledApp(WebContents* contents) { 111 const extensions::Extension* GetInstalledApp(WebContents* contents) {
111 const extensions::Extension* installed_app = NULL; 112 const extensions::Extension* installed_app = NULL;
112 Profile* profile = 113 Profile* profile =
113 Profile::FromBrowserContext(contents->GetBrowserContext()); 114 Profile::FromBrowserContext(contents->GetBrowserContext());
114 ExtensionService* service = profile->GetExtensionService(); 115 ExtensionService* service = profile->GetExtensionService();
115 if (service) { 116 if (service) {
116 std::set<std::string> extension_ids = 117 std::set<std::string> extension_ids =
117 service->process_map()->GetExtensionsInProcess( 118 extensions::ProcessMap::Get(profile)->GetExtensionsInProcess(
118 contents->GetRenderViewHost()->GetProcess()->GetID()); 119 contents->GetRenderViewHost()->GetProcess()->GetID());
119 for (std::set<std::string>::iterator iter = extension_ids.begin(); 120 for (std::set<std::string>::iterator iter = extension_ids.begin();
120 iter != extension_ids.end(); ++iter) { 121 iter != extension_ids.end(); ++iter) {
121 installed_app = service->extensions()->GetByID(*iter); 122 installed_app = service->extensions()->GetByID(*iter);
122 if (installed_app && installed_app->is_app()) 123 if (installed_app && installed_app->is_app())
123 return installed_app; 124 return installed_app;
124 } 125 }
125 } 126 }
126 return NULL; 127 return NULL;
127 } 128 }
(...skipping 460 matching lines...) Expand 10 before | Expand all | Expand 10 after
588 EXPECT_EQ("ss_app2", result); 589 EXPECT_EQ("ss_app2", result);
589 590
590 ui_test_utils::NavigateToURLWithDisposition( 591 ui_test_utils::NavigateToURLWithDisposition(
591 browser(), base_url.Resolve("non_app/main.html"), 592 browser(), base_url.Resolve("non_app/main.html"),
592 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); 593 CURRENT_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
593 ASSERT_TRUE(ExecuteScriptAndExtractString( 594 ASSERT_TRUE(ExecuteScriptAndExtractString(
594 browser()->tab_strip_model()->GetWebContentsAt(0), 595 browser()->tab_strip_model()->GetWebContentsAt(0),
595 kRetrieveSessionStorage.c_str(), &result)); 596 kRetrieveSessionStorage.c_str(), &result));
596 EXPECT_EQ("ss_normal", result); 597 EXPECT_EQ("ss_normal", result);
597 } 598 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extension_service.cc ('k') | chrome/browser/extensions/process_management_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698