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

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

Issue 649223004: Content Shell: Introduce LayoutTestBrowserMain. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@LayoutTestURLRequestContextGetter
Patch Set: ugh. Created 6 years, 2 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 | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/layout_test_browser_main.h » ('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"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/lazy_instance.h" 12 #include "base/lazy_instance.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/path_service.h" 14 #include "base/path_service.h"
15 #include "cc/base/switches.h" 15 #include "cc/base/switches.h"
16 #include "content/public/browser/browser_main_runner.h" 16 #include "content/public/browser/browser_main_runner.h"
17 #include "content/public/common/content_switches.h" 17 #include "content/public/common/content_switches.h"
18 #include "content/public/common/url_constants.h" 18 #include "content/public/common/url_constants.h"
19 #include "content/public/test/layouttest_support.h" 19 #include "content/public/test/layouttest_support.h"
20 #include "content/shell/app/shell_crash_reporter_client.h" 20 #include "content/shell/app/shell_crash_reporter_client.h"
21 #include "content/shell/app/webkit_test_platform_support.h" 21 #include "content/shell/app/webkit_test_platform_support.h"
22 #include "content/shell/browser/layout_test/layout_test_browser_main.h"
22 #include "content/shell/browser/shell_browser_main.h" 23 #include "content/shell/browser/shell_browser_main.h"
23 #include "content/shell/browser/shell_content_browser_client.h" 24 #include "content/shell/browser/shell_content_browser_client.h"
24 #include "content/shell/common/shell_switches.h" 25 #include "content/shell/common/shell_switches.h"
25 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h" 26 #include "content/shell/renderer/layout_test/layout_test_content_renderer_client .h"
26 #include "content/shell/renderer/shell_content_renderer_client.h" 27 #include "content/shell/renderer/shell_content_renderer_client.h"
27 #include "media/base/media_switches.h" 28 #include "media/base/media_switches.h"
28 #include "net/cookies/cookie_monster.h" 29 #include "net/cookies/cookie_monster.h"
29 #include "ui/base/resource/resource_bundle.h" 30 #include "ui/base/resource/resource_bundle.h"
30 #include "ui/base/ui_base_paths.h" 31 #include "ui/base/ui_base_paths.h"
31 #include "ui/base/ui_base_switches.h" 32 #include "ui/base/ui_base_switches.h"
(...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after
244 if (!process_type.empty()) 245 if (!process_type.empty())
245 return -1; 246 return -1;
246 247
247 #if !defined(OS_ANDROID) 248 #if !defined(OS_ANDROID)
248 // Android stores the BrowserMainRunner instance as a scoped member pointer 249 // Android stores the BrowserMainRunner instance as a scoped member pointer
249 // on the ShellMainDelegate class because of different object lifetime. 250 // on the ShellMainDelegate class because of different object lifetime.
250 scoped_ptr<BrowserMainRunner> browser_runner_; 251 scoped_ptr<BrowserMainRunner> browser_runner_;
251 #endif 252 #endif
252 253
253 browser_runner_.reset(BrowserMainRunner::Create()); 254 browser_runner_.reset(BrowserMainRunner::Create());
254 return ShellBrowserMain(main_function_params, browser_runner_); 255 CommandLine& command_line = *CommandLine::ForCurrentProcess();
256 return command_line.HasSwitch(switches::kDumpRenderTree) ||
257 command_line.HasSwitch(switches::kCheckLayoutTestSysDeps)
258 ? LayoutTestBrowserMain(main_function_params, browser_runner_)
259 : ShellBrowserMain(main_function_params, browser_runner_);
255 } 260 }
256 261
257 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) 262 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX)
258 void ShellMainDelegate::ZygoteForked() { 263 void ShellMainDelegate::ZygoteForked() {
259 if (CommandLine::ForCurrentProcess()->HasSwitch( 264 if (CommandLine::ForCurrentProcess()->HasSwitch(
260 switches::kEnableCrashReporter)) { 265 switches::kEnableCrashReporter)) {
261 std::string process_type = 266 std::string process_type =
262 CommandLine::ForCurrentProcess()->GetSwitchValueASCII( 267 CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
263 switches::kProcessType); 268 switches::kProcessType);
264 breakpad::InitCrashReporter(process_type); 269 breakpad::InitCrashReporter(process_type);
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
309 314
310 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() { 315 ContentRendererClient* ShellMainDelegate::CreateContentRendererClient() {
311 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) 316 if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree))
312 renderer_client_.reset(new LayoutTestContentRendererClient); 317 renderer_client_.reset(new LayoutTestContentRendererClient);
313 else 318 else
314 renderer_client_.reset(new ShellContentRendererClient); 319 renderer_client_.reset(new ShellContentRendererClient);
315 return renderer_client_.get(); 320 return renderer_client_.get();
316 } 321 }
317 322
318 } // namespace content 323 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/BUILD.gn ('k') | content/shell/browser/layout_test/layout_test_browser_main.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698