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 "content/shell/app/shell_main_delegate.h" | 5 #include "content/shell/app/shell_main_delegate.h" |
6 | 6 |
7 #include "base/base_switches.h" | 7 #include "base/base_switches.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/cpu.h" | 9 #include "base/cpu.h" |
10 #include "base/files/file.h" | 10 #include "base/files/file.h" |
11 #include "base/files/file_path.h" | 11 #include "base/files/file_path.h" |
12 #include "base/lazy_instance.h" | 12 #include "base/lazy_instance.h" |
13 #include "base/logging.h" | 13 #include "base/logging.h" |
14 #include "base/path_service.h" | 14 #include "base/path_service.h" |
15 #include "cc/base/switches.h" | 15 #include "cc/base/switches.h" |
16 #include "content/public/browser/browser_main_runner.h" | 16 #include "content/public/browser/browser_main_runner.h" |
17 #include "content/public/common/content_switches.h" | 17 #include "content/public/common/content_switches.h" |
18 #include "content/public/common/url_constants.h" | 18 #include "content/public/common/url_constants.h" |
19 #include "content/public/test/layouttest_support.h" | 19 #include "content/public/test/layouttest_support.h" |
20 #include "content/shell/app/blink_test_platform_support.h" | 20 #include "content/shell/app/blink_test_platform_support.h" |
21 #include "content/shell/app/shell_crash_reporter_client.h" | 21 #include "content/shell/app/shell_crash_reporter_client.h" |
22 #include "content/shell/browser/layout_test/layout_test_browser_main.h" | 22 #include "content/shell/browser/layout_test/layout_test_browser_main.h" |
23 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h
" | 23 #include "content/shell/browser/layout_test/layout_test_content_browser_client.h
" |
24 #include "content/shell/browser/shell_browser_main.h" | 24 #include "content/shell/browser/shell_browser_main.h" |
25 #include "content/shell/browser/shell_content_browser_client.h" | 25 #include "content/shell/browser/shell_content_browser_client.h" |
26 #include "content/shell/common/shell_switches.h" | 26 #include "content/shell/common/shell_switches.h" |
27 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" | 27 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client
.h" |
28 #include "content/shell/renderer/shell_content_renderer_client.h" | 28 #include "content/shell/renderer/shell_content_renderer_client.h" |
29 #include "media/base/media_switches.h" | 29 #include "media/base/media_switches.h" |
| 30 #include "media/base/mime_util.h" |
30 #include "net/cookies/cookie_monster.h" | 31 #include "net/cookies/cookie_monster.h" |
31 #include "ui/base/resource/resource_bundle.h" | 32 #include "ui/base/resource/resource_bundle.h" |
32 #include "ui/base/ui_base_paths.h" | 33 #include "ui/base/ui_base_paths.h" |
33 #include "ui/base/ui_base_switches.h" | 34 #include "ui/base/ui_base_switches.h" |
34 #include "ui/events/event_switches.h" | 35 #include "ui/events/event_switches.h" |
35 #include "ui/gfx/switches.h" | 36 #include "ui/gfx/switches.h" |
36 #include "ui/gl/gl_switches.h" | 37 #include "ui/gl/gl_switches.h" |
37 | 38 |
38 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. | 39 #include "ipc/ipc_message.h" // For IPC_MESSAGE_LOG_ENABLED. |
39 | 40 |
(...skipping 156 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 | 197 |
197 command_line.AppendSwitchASCII(switches::kHostResolverRules, | 198 command_line.AppendSwitchASCII(switches::kHostResolverRules, |
198 "MAP *.test 127.0.0.1"); | 199 "MAP *.test 127.0.0.1"); |
199 | 200 |
200 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. | 201 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. |
201 command_line.AppendSwitch(switches::kEnableNpapi); | 202 command_line.AppendSwitch(switches::kEnableNpapi); |
202 | 203 |
203 // Unless/until WebM files are added to the media layout tests, we need to | 204 // Unless/until WebM files are added to the media layout tests, we need to |
204 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 205 // avoid removing MP4/H264/AAC so that layout tests can run on Android. |
205 #if !defined(OS_ANDROID) | 206 #if !defined(OS_ANDROID) |
206 net::RemoveProprietaryMediaTypesAndCodecsForTests(); | 207 media::RemoveProprietaryMediaTypesAndCodecsForTests(); |
207 #endif | 208 #endif |
208 | 209 |
209 if (!BlinkTestPlatformInitialize()) { | 210 if (!BlinkTestPlatformInitialize()) { |
210 if (exit_code) | 211 if (exit_code) |
211 *exit_code = 1; | 212 *exit_code = 1; |
212 return true; | 213 return true; |
213 } | 214 } |
214 } | 215 } |
215 SetContentClient(&content_client_); | 216 SetContentClient(&content_client_); |
216 return false; | 217 return false; |
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
335 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 336 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
336 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( | 337 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
337 switches::kRunLayoutTest) | 338 switches::kRunLayoutTest) |
338 ? new LayoutTestContentRendererClient | 339 ? new LayoutTestContentRendererClient |
339 : new ShellContentRendererClient); | 340 : new ShellContentRendererClient); |
340 | 341 |
341 return renderer_client_.get(); | 342 return renderer_client_.get(); |
342 } | 343 } |
343 | 344 |
344 } // namespace content | 345 } // namespace content |
OLD | NEW |