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" |
(...skipping 185 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
196 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. | 196 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. |
197 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); | 197 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); |
198 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); | 198 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); |
199 | 199 |
200 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); | 200 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); |
201 | 201 |
202 command_line.AppendSwitchASCII(switches::kHostResolverRules, | 202 command_line.AppendSwitchASCII(switches::kHostResolverRules, |
203 "MAP *.test 127.0.0.1"); | 203 "MAP *.test 127.0.0.1"); |
204 | 204 |
205 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. | 205 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. |
206 command_line.AppendSwitch(switches::kEnableNpapi); | 206 command_line.AppendSwitch(switches::kEnableNpapiForTesting); |
207 | 207 |
208 // Unless/until WebM files are added to the media layout tests, we need to | 208 // Unless/until WebM files are added to the media layout tests, we need to |
209 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 209 // avoid removing MP4/H264/AAC so that layout tests can run on Android. |
210 #if !defined(OS_ANDROID) | 210 #if !defined(OS_ANDROID) |
211 media::RemoveProprietaryMediaTypesAndCodecsForTests(); | 211 media::RemoveProprietaryMediaTypesAndCodecsForTests(); |
212 #endif | 212 #endif |
213 | 213 |
214 if (!BlinkTestPlatformInitialize()) { | 214 if (!BlinkTestPlatformInitialize()) { |
215 if (exit_code) | 215 if (exit_code) |
216 *exit_code = 1; | 216 *exit_code = 1; |
(...skipping 123 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
340 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { | 340 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { |
341 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( | 341 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( |
342 switches::kRunLayoutTest) | 342 switches::kRunLayoutTest) |
343 ? new LayoutTestContentRendererClient | 343 ? new LayoutTestContentRendererClient |
344 : new ShellContentRendererClient); | 344 : new ShellContentRendererClient); |
345 | 345 |
346 return renderer_client_.get(); | 346 return renderer_client_.get(); |
347 } | 347 } |
348 | 348 |
349 } // namespace content | 349 } // namespace content |
OLD | NEW |