OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "content/test/content_browser_test.h" | 5 #include "content/test/content_browser_test.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/files/file_path.h" | 8 #include "base/files/file_path.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/message_loop.h" | 10 #include "base/message_loop.h" |
11 #include "base/path_service.h" | 11 #include "base/path_service.h" |
12 #include "content/public/browser/render_process_host.h" | 12 #include "content/public/browser/render_process_host.h" |
13 #include "content/public/common/content_switches.h" | 13 #include "content/public/common/content_switches.h" |
14 #include "content/public/common/url_constants.h" | 14 #include "content/public/common/url_constants.h" |
| 15 #include "content/shell/common/shell_switches.h" |
15 #include "content/shell/renderer/shell_content_renderer_client.h" | 16 #include "content/shell/renderer/shell_content_renderer_client.h" |
16 #include "content/shell/shell.h" | 17 #include "content/shell/shell.h" |
17 #include "content/shell/shell_browser_context.h" | 18 #include "content/shell/shell_browser_context.h" |
18 #include "content/shell/shell_content_browser_client.h" | 19 #include "content/shell/shell_content_browser_client.h" |
19 #include "content/shell/shell_main_delegate.h" | 20 #include "content/shell/shell_main_delegate.h" |
20 #include "content/shell/shell_switches.h" | |
21 #include "content/test/test_content_client.h" | 21 #include "content/test/test_content_client.h" |
22 | 22 |
23 #if defined(OS_MACOSX) | 23 #if defined(OS_MACOSX) |
24 #include "base/mac/scoped_nsautorelease_pool.h" | 24 #include "base/mac/scoped_nsautorelease_pool.h" |
25 #endif | 25 #endif |
26 | 26 |
27 namespace content { | 27 namespace content { |
28 | 28 |
29 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) { | 29 IN_PROC_BROWSER_TEST_F(ContentBrowserTest, MANUAL_ShouldntRun) { |
30 // Ensures that tests with MANUAL_ prefix don't run automatically. | 30 // Ensures that tests with MANUAL_ prefix don't run automatically. |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
141 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { | 141 Shell* ContentBrowserTest::CreateOffTheRecordBrowser() { |
142 return Shell::CreateNewWindow( | 142 return Shell::CreateNewWindow( |
143 ShellContentBrowserClient::Get()->off_the_record_browser_context(), | 143 ShellContentBrowserClient::Get()->off_the_record_browser_context(), |
144 GURL(chrome::kAboutBlankURL), | 144 GURL(chrome::kAboutBlankURL), |
145 NULL, | 145 NULL, |
146 MSG_ROUTING_NONE, | 146 MSG_ROUTING_NONE, |
147 gfx::Size()); | 147 gfx::Size()); |
148 } | 148 } |
149 | 149 |
150 } // namespace content | 150 } // namespace content |
OLD | NEW |