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

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

Issue 529403002: Layout Tests should support '*.test' URLs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: content_shell Created 6 years, 3 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 | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | 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 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 #if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX) 169 #if defined(USE_AURA) || defined(OS_ANDROID) || defined(OS_MACOSX)
170 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer. 170 // TODO: crbug.com/311404 Make layout tests work w/ delegated renderer.
171 command_line.AppendSwitch(switches::kDisableDelegatedRenderer); 171 command_line.AppendSwitch(switches::kDisableDelegatedRenderer);
172 command_line.AppendSwitch(cc::switches::kCompositeToMailbox); 172 command_line.AppendSwitch(cc::switches::kCompositeToMailbox);
173 #endif 173 #endif
174 174
175 command_line.AppendSwitch(switches::kEnableFileCookies); 175 command_line.AppendSwitch(switches::kEnableFileCookies);
176 176
177 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo); 177 command_line.AppendSwitch(switches::kEnablePreciseMemoryInfo);
178 178
179 command_line.AppendSwitchASCII(switches::kHostResolverRules,
180 "MAP *.test 127.0.0.1");
181
179 // Unless/until WebM files are added to the media layout tests, we need to 182 // Unless/until WebM files are added to the media layout tests, we need to
180 // avoid removing MP4/H264/AAC so that layout tests can run on Android. 183 // avoid removing MP4/H264/AAC so that layout tests can run on Android.
181 #if !defined(OS_ANDROID) 184 #if !defined(OS_ANDROID)
182 net::RemoveProprietaryMediaTypesAndCodecsForTests(); 185 net::RemoveProprietaryMediaTypesAndCodecsForTests();
183 #endif 186 #endif
184 187
185 if (!WebKitTestPlatformInitialize()) { 188 if (!WebKitTestPlatformInitialize()) {
186 if (exit_code) 189 if (exit_code)
187 *exit_code = 1; 190 *exit_code = 1;
188 return true; 191 return true;
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
299 browser_client_.reset(new ShellContentBrowserClient); 302 browser_client_.reset(new ShellContentBrowserClient);
300 return browser_client_.get(); 303 return browser_client_.get();
301 } 304 }
302 305
303 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 306 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
304 renderer_client_.reset(new ShellContentRendererClient); 307 renderer_client_.reset(new ShellContentRendererClient);
305 return renderer_client_.get(); 308 return renderer_client_.get();
306 } 309 }
307 310
308 } // namespace content 311 } // namespace content
OLDNEW
« no previous file with comments | « no previous file | content/shell/renderer/test_runner/web_test_proxy.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698