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/strings/utf_string_conversions.h" | 5 #include "base/strings/utf_string_conversions.h" |
6 #include "chrome/browser/extensions/extension_apitest.h" | 6 #include "chrome/browser/extensions/extension_apitest.h" |
7 #include "chrome/browser/extensions/extension_host.h" | 7 #include "chrome/browser/extensions/extension_host.h" |
8 #include "chrome/browser/extensions/extension_process_manager.h" | 8 #include "chrome/browser/extensions/extension_process_manager.h" |
9 #include "chrome/browser/extensions/extension_service.h" | 9 #include "chrome/browser/extensions/extension_service.h" |
10 #include "chrome/browser/extensions/extension_system.h" | 10 #include "chrome/browser/extensions/extension_system.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/tabs/tab_strip_model.h" | 14 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
15 #include "chrome/common/chrome_switches.h" | |
16 #include "chrome/common/url_constants.h" | 15 #include "chrome/common/url_constants.h" |
17 #include "chrome/test/base/ui_test_utils.h" | 16 #include "chrome/test/base/ui_test_utils.h" |
18 #include "content/public/browser/render_process_host.h" | 17 #include "content/public/browser/render_process_host.h" |
19 #include "content/public/browser/render_view_host.h" | 18 #include "content/public/browser/render_view_host.h" |
20 #include "content/public/browser/site_instance.h" | 19 #include "content/public/browser/site_instance.h" |
21 #include "content/public/browser/web_contents.h" | 20 #include "content/public/browser/web_contents.h" |
| 21 #include "extensions/common/switches.h" |
22 #include "net/dns/mock_host_resolver.h" | 22 #include "net/dns/mock_host_resolver.h" |
23 #include "net/test/embedded_test_server/embedded_test_server.h" | 23 #include "net/test/embedded_test_server/embedded_test_server.h" |
24 | 24 |
25 using content::NavigationController; | 25 using content::NavigationController; |
26 using content::WebContents; | 26 using content::WebContents; |
27 | 27 |
28 namespace { | 28 namespace { |
29 | 29 |
30 class ProcessManagementTest : public ExtensionBrowserTest { | 30 class ProcessManagementTest : public ExtensionBrowserTest { |
31 private: | 31 private: |
32 // This is needed for testing isolated apps, which are still experimental. | 32 // This is needed for testing isolated apps, which are still experimental. |
33 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { | 33 virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE { |
34 ExtensionBrowserTest::SetUpCommandLine(command_line); | 34 ExtensionBrowserTest::SetUpCommandLine(command_line); |
35 command_line->AppendSwitch(switches::kEnableExperimentalExtensionApis); | 35 command_line->AppendSwitch( |
| 36 extensions::switches::kEnableExperimentalExtensionApis); |
36 } | 37 } |
37 }; | 38 }; |
38 | 39 |
39 } // namespace | 40 } // namespace |
40 | 41 |
41 | 42 |
42 // TODO(nasko): crbug.com/173137 | 43 // TODO(nasko): crbug.com/173137 |
43 #if defined(OS_WIN) | 44 #if defined(OS_WIN) |
44 #define MAYBE_ProcessOverflow DISABLED_ProcessOverflow | 45 #define MAYBE_ProcessOverflow DISABLED_ProcessOverflow |
45 #else | 46 #else |
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
241 | 242 |
242 // We've loaded 5 extensions with background pages, 1 extension without | 243 // We've loaded 5 extensions with background pages, 1 extension without |
243 // 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 |
244 // hosting those extensions. | 245 // hosting those extensions. |
245 ExtensionService* service = | 246 ExtensionService* service = |
246 extensions::ExtensionSystem::Get(profile)->extension_service(); | 247 extensions::ExtensionSystem::Get(profile)->extension_service(); |
247 | 248 |
248 EXPECT_GE((size_t) 6, service->process_map()->size()); | 249 EXPECT_GE((size_t) 6, service->process_map()->size()); |
249 EXPECT_EQ((size_t) 2, process_ids.size()); | 250 EXPECT_EQ((size_t) 2, process_ids.size()); |
250 } | 251 } |
OLD | NEW |