| Index: content/shell/app/shell_main_delegate.cc
|
| diff --git a/content/shell/app/shell_main_delegate.cc b/content/shell/app/shell_main_delegate.cc
|
| index fffc4ab51cb8f887dfdfdcba5a3dc71a45142e7d..914c2644d6c6c6caa26ceac5d860c75e6b1e175a 100644
|
| --- a/content/shell/app/shell_main_delegate.cc
|
| +++ b/content/shell/app/shell_main_delegate.cc
|
| @@ -176,11 +176,9 @@ bool ShellMainDelegate::BasicStartupComplete(int* exit_code) {
|
| command_line.AppendSwitch(switches::kEnableInbandTextTracks);
|
| command_line.AppendSwitch(switches::kMuteAudio);
|
|
|
| -#if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX)
|
| // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
|
| command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
|
| command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
|
| -#endif
|
|
|
| command_line.AppendSwitch(switches::kEnableFileCookies);
|
|
|
|
|