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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include "base/strings/utf_string_conversions.h" | 7 #include "base/strings/utf_string_conversions.h" |
8 #include "build/build_config.h" | 8 #include "build/build_config.h" |
9 #include "chrome/browser/extensions/extension_apitest.h" | 9 #include "chrome/browser/extensions/extension_apitest.h" |
10 #include "chrome/browser/extensions/extension_service.h" | 10 #include "chrome/browser/extensions/extension_service.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 const extensions::Extension* extension1 = LoadExtension( | 77 const extensions::Extension* extension1 = LoadExtension( |
78 test_data_dir_.AppendASCII("api_test/browser_action/basics")); | 78 test_data_dir_.AppendASCII("api_test/browser_action/basics")); |
79 ASSERT_TRUE(extension1); | 79 ASSERT_TRUE(extension1); |
80 GURL extension1_url = extension1->url(); | 80 GURL extension1_url = extension1->url(); |
81 | 81 |
82 // Create multiple tabs for each type of renderer that might exist. | 82 // Create multiple tabs for each type of renderer that might exist. |
83 ui_test_utils::NavigateToURL( | 83 ui_test_utils::NavigateToURL( |
84 browser(), base_url.Resolve("isolated_apps/app1/main.html")); | 84 browser(), base_url.Resolve("isolated_apps/app1/main.html")); |
85 ui_test_utils::NavigateToURLWithDisposition( | 85 ui_test_utils::NavigateToURLWithDisposition( |
86 browser(), GURL(chrome::kChromeUINewTabURL), | 86 browser(), GURL(chrome::kChromeUINewTabURL), |
87 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 87 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 88 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
88 ui_test_utils::NavigateToURLWithDisposition( | 89 ui_test_utils::NavigateToURLWithDisposition( |
89 browser(), base_url.Resolve("hosted_app/main.html"), | 90 browser(), base_url.Resolve("hosted_app/main.html"), |
90 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 91 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 92 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
91 ui_test_utils::NavigateToURLWithDisposition( | 93 ui_test_utils::NavigateToURLWithDisposition( |
92 browser(), base_url.Resolve("test_file.html"), | 94 browser(), base_url.Resolve("test_file.html"), |
93 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 95 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 96 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
94 | 97 |
95 ui_test_utils::NavigateToURLWithDisposition( | 98 ui_test_utils::NavigateToURLWithDisposition( |
96 browser(), base_url.Resolve("isolated_apps/app2/main.html"), | 99 browser(), base_url.Resolve("isolated_apps/app2/main.html"), |
97 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 100 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 101 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
98 ui_test_utils::NavigateToURLWithDisposition( | 102 ui_test_utils::NavigateToURLWithDisposition( |
99 browser(), GURL(chrome::kChromeUINewTabURL), | 103 browser(), GURL(chrome::kChromeUINewTabURL), |
100 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 104 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 105 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
101 ui_test_utils::NavigateToURLWithDisposition( | 106 ui_test_utils::NavigateToURLWithDisposition( |
102 browser(), base_url.Resolve("api_test/app_process/path1/empty.html"), | 107 browser(), base_url.Resolve("api_test/app_process/path1/empty.html"), |
103 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 108 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 109 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
104 ui_test_utils::NavigateToURLWithDisposition( | 110 ui_test_utils::NavigateToURLWithDisposition( |
105 browser(), base_url.Resolve("test_file_with_body.html"), | 111 browser(), base_url.Resolve("test_file_with_body.html"), |
106 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 112 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 113 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
107 | 114 |
108 // Load another copy of isolated app 1. | 115 // Load another copy of isolated app 1. |
109 ui_test_utils::NavigateToURLWithDisposition( | 116 ui_test_utils::NavigateToURLWithDisposition( |
110 browser(), base_url.Resolve("isolated_apps/app1/main.html"), | 117 browser(), base_url.Resolve("isolated_apps/app1/main.html"), |
111 NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); | 118 WindowOpenDisposition::NEW_FOREGROUND_TAB, |
| 119 ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION); |
112 | 120 |
113 // Load another extension. | 121 // Load another extension. |
114 const extensions::Extension* extension2 = LoadExtension( | 122 const extensions::Extension* extension2 = LoadExtension( |
115 test_data_dir_.AppendASCII("api_test/browser_action/close_background")); | 123 test_data_dir_.AppendASCII("api_test/browser_action/close_background")); |
116 ASSERT_TRUE(extension2); | 124 ASSERT_TRUE(extension2); |
117 GURL extension2_url = extension2->url(); | 125 GURL extension2_url = extension2->url(); |
118 | 126 |
119 // Get tab processes. | 127 // Get tab processes. |
120 ASSERT_EQ(9, browser()->tab_strip_model()->count()); | 128 ASSERT_EQ(9, browser()->tab_strip_model()->count()); |
121 content::RenderProcessHost* isolated1_host = | 129 content::RenderProcessHost* isolated1_host = |
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
233 process_ids.insert(host->render_process_host()->GetID()); | 241 process_ids.insert(host->render_process_host()->GetID()); |
234 | 242 |
235 // We've loaded 5 extensions with background pages, 1 extension without | 243 // We've loaded 5 extensions with background pages, 1 extension without |
236 // background page, and one isolated app. We expect only 2 unique processes | 244 // background page, and one isolated app. We expect only 2 unique processes |
237 // hosting those extensions. | 245 // hosting those extensions. |
238 extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile); | 246 extensions::ProcessMap* process_map = extensions::ProcessMap::Get(profile); |
239 | 247 |
240 EXPECT_GE((size_t) 6, process_map->size()); | 248 EXPECT_GE((size_t) 6, process_map->size()); |
241 EXPECT_EQ((size_t) 2, process_ids.size()); | 249 EXPECT_EQ((size_t) 2, process_ids.size()); |
242 } | 250 } |
OLD | NEW |