Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(617)

Side by Side Diff: content/shell/app/shell_main_delegate.cc

Issue 1068383002: Re-enable property tree verification for layout tests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 175 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas); 186 command_line.AppendSwitch(switches::kDisableDisplayList2dCanvas);
187 } 187 }
188 188
189 command_line.AppendSwitch(switches::kEnableInbandTextTracks); 189 command_line.AppendSwitch(switches::kEnableInbandTextTracks);
190 command_line.AppendSwitch(switches::kMuteAudio); 190 command_line.AppendSwitch(switches::kMuteAudio);
191 191
192 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. 192 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
193 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); 193 command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
194 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 194 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
195 195
196 command_line.AppendSwitch(cc::switches::kEnablePropertyTreeVerification);
197
196 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 198 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
197 199
198 command_line.AppendSwitchASCII(switches::kHostResolverRules, 200 command_line.AppendSwitchASCII(switches::kHostResolverRules,
199 "MAP *.test 127.0.0.1"); 201 "MAP *.test 127.0.0.1");
200 202
201 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone. 203 // TODO(wfh): crbug.com/295137 Remove this when NPAPI is gone.
202 command_line.AppendSwitch(switches::kEnableNpapi); 204 command_line.AppendSwitch(switches::kEnableNpapi);
203 205
204 // Unless/until WebM files are added to the media layout tests, we need to 206 // Unless/until WebM files are added to the media layout tests, we need to
205 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 207 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
(...skipping 130 matching lines...) Expand 10 before | Expand all | Expand 10 after
336 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 338 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
337 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch( 339 renderer_client_.reset(base::CommandLine::ForCurrentProcess()->HasSwitch(
338 switches::kRunLayoutTest) 340 switches::kRunLayoutTest)
339 ? new LayoutTestContentRendererClient 341 ? new LayoutTestContentRendererClient
340 : new ShellContentRendererClient); 342 : new ShellContentRendererClient);
341 343
342 return renderer_client_.get(); 344 return renderer_client_.get();
343 } 345 }
344 346
345 } // namespace content 347 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698