OLD | NEW |
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/utf_string_conversions.h" | 5 #include "base/utf_string_conversions.h" |
6 #include "chrome/browser/automation/automation_util.h" | 6 #include "chrome/browser/automation/automation_util.h" |
7 #include "chrome/browser/extensions/extension_apitest.h" | 7 #include "chrome/browser/extensions/extension_apitest.h" |
8 #include "chrome/browser/extensions/extension_host.h" | 8 #include "chrome/browser/extensions/extension_host.h" |
9 #include "chrome/browser/extensions/extension_process_manager.h" | 9 #include "chrome/browser/extensions/extension_process_manager.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/profiles/profile_manager.h" | 12 #include "chrome/browser/profiles/profile_manager.h" |
13 #include "chrome/browser/ui/browser.h" | 13 #include "chrome/browser/ui/browser.h" |
| 14 #include "chrome/browser/ui/browser_tabstrip.h" |
14 #include "chrome/browser/ui/tab_contents/tab_contents.h" | 15 #include "chrome/browser/ui/tab_contents/tab_contents.h" |
15 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
16 #include "chrome/common/url_constants.h" | 17 #include "chrome/common/url_constants.h" |
17 #include "chrome/test/base/ui_test_utils.h" | 18 #include "chrome/test/base/ui_test_utils.h" |
18 #include "content/public/browser/render_process_host.h" | 19 #include "content/public/browser/render_process_host.h" |
19 #include "content/public/browser/render_view_host.h" | 20 #include "content/public/browser/render_view_host.h" |
20 #include "content/public/browser/site_instance.h" | 21 #include "content/public/browser/site_instance.h" |
21 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
22 #include "net/base/mock_host_resolver.h" | 23 #include "net/base/mock_host_resolver.h" |
23 | 24 |
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
102 | 103 |
103 // Load another extension. | 104 // Load another extension. |
104 const extensions::Extension* extension2 = LoadExtension( | 105 const extensions::Extension* extension2 = LoadExtension( |
105 test_data_dir_.AppendASCII("api_test/browser_action/close_background")); | 106 test_data_dir_.AppendASCII("api_test/browser_action/close_background")); |
106 ASSERT_TRUE(extension2); | 107 ASSERT_TRUE(extension2); |
107 GURL extension2_url = extension2->url(); | 108 GURL extension2_url = extension2->url(); |
108 | 109 |
109 // Get tab processes. | 110 // Get tab processes. |
110 ASSERT_EQ(9, browser()->tab_count()); | 111 ASSERT_EQ(9, browser()->tab_count()); |
111 content::RenderProcessHost* isolated1_host = | 112 content::RenderProcessHost* isolated1_host = |
112 browser()->GetWebContentsAt(0)->GetRenderProcessHost(); | 113 chrome::GetWebContentsAt(browser(), 0)->GetRenderProcessHost(); |
113 content::RenderProcessHost* ntp1_host = | 114 content::RenderProcessHost* ntp1_host = |
114 browser()->GetWebContentsAt(1)->GetRenderProcessHost(); | 115 chrome::GetWebContentsAt(browser(), 1)->GetRenderProcessHost(); |
115 content::RenderProcessHost* hosted1_host = | 116 content::RenderProcessHost* hosted1_host = |
116 browser()->GetWebContentsAt(2)->GetRenderProcessHost(); | 117 chrome::GetWebContentsAt(browser(), 2)->GetRenderProcessHost(); |
117 content::RenderProcessHost* web1_host = | 118 content::RenderProcessHost* web1_host = |
118 browser()->GetWebContentsAt(3)->GetRenderProcessHost(); | 119 chrome::GetWebContentsAt(browser(), 3)->GetRenderProcessHost(); |
119 | 120 |
120 content::RenderProcessHost* isolated2_host = | 121 content::RenderProcessHost* isolated2_host = |
121 browser()->GetWebContentsAt(4)->GetRenderProcessHost(); | 122 chrome::GetWebContentsAt(browser(), 4)->GetRenderProcessHost(); |
122 content::RenderProcessHost* ntp2_host = | 123 content::RenderProcessHost* ntp2_host = |
123 browser()->GetWebContentsAt(5)->GetRenderProcessHost(); | 124 chrome::GetWebContentsAt(browser(), 5)->GetRenderProcessHost(); |
124 content::RenderProcessHost* hosted2_host = | 125 content::RenderProcessHost* hosted2_host = |
125 browser()->GetWebContentsAt(6)->GetRenderProcessHost(); | 126 chrome::GetWebContentsAt(browser(), 6)->GetRenderProcessHost(); |
126 content::RenderProcessHost* web2_host = | 127 content::RenderProcessHost* web2_host = |
127 browser()->GetWebContentsAt(7)->GetRenderProcessHost(); | 128 chrome::GetWebContentsAt(browser(), 7)->GetRenderProcessHost(); |
128 | 129 |
129 content::RenderProcessHost* second_isolated1_host = | 130 content::RenderProcessHost* second_isolated1_host = |
130 browser()->GetWebContentsAt(8)->GetRenderProcessHost(); | 131 chrome::GetWebContentsAt(browser(), 8)->GetRenderProcessHost(); |
131 | 132 |
132 // Get extension processes. | 133 // Get extension processes. |
133 ExtensionProcessManager* process_manager = | 134 ExtensionProcessManager* process_manager = |
134 browser()->profile()->GetExtensionProcessManager(); | 135 browser()->profile()->GetExtensionProcessManager(); |
135 content::RenderProcessHost* extension1_host = | 136 content::RenderProcessHost* extension1_host = |
136 process_manager->GetSiteInstanceForURL(extension1_url)->GetProcess(); | 137 process_manager->GetSiteInstanceForURL(extension1_url)->GetProcess(); |
137 content::RenderProcessHost* extension2_host = | 138 content::RenderProcessHost* extension2_host = |
138 process_manager->GetSiteInstanceForURL(extension2_url)->GetProcess(); | 139 process_manager->GetSiteInstanceForURL(extension2_url)->GetProcess(); |
139 | 140 |
140 // An isolated app only shares with other instances of itself, not other | 141 // An isolated app only shares with other instances of itself, not other |
(...skipping 81 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
222 iter != epm->background_hosts().end(); ++iter) { | 223 iter != epm->background_hosts().end(); ++iter) { |
223 process_ids.insert((*iter)->render_process_host()->GetID()); | 224 process_ids.insert((*iter)->render_process_host()->GetID()); |
224 } | 225 } |
225 | 226 |
226 // We've loaded 5 extensions with background pages, 1 extension without | 227 // We've loaded 5 extensions with background pages, 1 extension without |
227 // background page, and one isolated app. We expect only 2 unique processes | 228 // background page, and one isolated app. We expect only 2 unique processes |
228 // hosting those extensions. | 229 // hosting those extensions. |
229 EXPECT_GE((size_t) 6, profile->GetExtensionService()->process_map()->size()); | 230 EXPECT_GE((size_t) 6, profile->GetExtensionService()->process_map()->size()); |
230 EXPECT_EQ((size_t) 2, process_ids.size()); | 231 EXPECT_EQ((size_t) 2, process_ids.size()); |
231 } | 232 } |
OLD | NEW |