| 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 184 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 195 } | 195 } |
| 196 | 196 |
| 197 command_line.AppendSwitch(switches::kEnableInbandTextTracks); | 197 command_line.AppendSwitch(switches::kEnableInbandTextTracks); |
| 198 command_line.AppendSwitch(switches::kMuteAudio); | 198 command_line.AppendSwitch(switches::kMuteAudio); |
| 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 command_line.AppendSwitch(switches::kEnablePartialRaster); |
| 206 |
| 205 // Unless/until WebM files are added to the media layout tests, we need to | 207 // Unless/until WebM files are added to the media layout tests, we need to |
| 206 // avoid removing MP4/H264/AAC so that layout tests can run on Android. | 208 // avoid removing MP4/H264/AAC so that layout tests can run on Android. |
| 207 #if !defined(OS_ANDROID) | 209 #if !defined(OS_ANDROID) |
| 208 media::RemoveProprietaryMediaTypesAndCodecsForTests(); | 210 media::RemoveProprietaryMediaTypesAndCodecsForTests(); |
| 209 #endif | 211 #endif |
| 210 | 212 |
| 211 if (!BlinkTestPlatformInitialize()) { | 213 if (!BlinkTestPlatformInitialize()) { |
| 212 *exit_code = 1; | 214 *exit_code = 1; |
| 213 return true; | 215 return true; |
| 214 } | 216 } |
| (...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 359 | 361 |
| 360 return renderer_client_.get(); | 362 return renderer_client_.get(); |
| 361 } | 363 } |
| 362 | 364 |
| 363 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { | 365 ContentUtilityClient* ShellMainDelegate::CreateContentUtilityClient() { |
| 364 utility_client_.reset(new ShellContentUtilityClient); | 366 utility_client_.reset(new ShellContentUtilityClient); |
| 365 return utility_client_.get(); | 367 return utility_client_.get(); |
| 366 } | 368 } |
| 367 | 369 |
| 368 } // namespace content | 370 } // namespace content |
| OLD | NEW |