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

Side by Side Diff: content/shell/browser/shell_browser_main.cc

Issue 23316003: [content shell] move browser process stuff into browser/ subdir (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 4 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 | Annotate | Revision Log
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/shell_browser_main.h" 5 #include "content/shell/browser/shell_browser_main.h"
6 6
7 #include <iostream> 7 #include <iostream>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/file_util.h" 10 #include "base/file_util.h"
11 #include "base/files/file_path.h" 11 #include "base/files/file_path.h"
12 #include "base/files/scoped_temp_dir.h" 12 #include "base/files/scoped_temp_dir.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop/message_loop.h" 15 #include "base/message_loop/message_loop.h"
16 #include "base/strings/sys_string_conversions.h" 16 #include "base/strings/sys_string_conversions.h"
17 #include "base/strings/utf_string_conversions.h" 17 #include "base/strings/utf_string_conversions.h"
18 #include "base/threading/thread_restrictions.h" 18 #include "base/threading/thread_restrictions.h"
19 #include "content/public/browser/browser_main_runner.h" 19 #include "content/public/browser/browser_main_runner.h"
20 #include "content/shell/browser/shell.h"
21 #include "content/shell/browser/webkit_test_controller.h"
20 #include "content/shell/common/shell_switches.h" 22 #include "content/shell/common/shell_switches.h"
21 #include "content/shell/common/webkit_test_helpers.h" 23 #include "content/shell/common/webkit_test_helpers.h"
22 #include "content/shell/shell.h"
23 #include "content/shell/webkit_test_controller.h"
24 #include "net/base/net_util.h" 24 #include "net/base/net_util.h"
25 #include "webkit/support/webkit_support.h" 25 #include "webkit/support/webkit_support.h"
26 26
27 #if defined(OS_ANDROID) 27 #if defined(OS_ANDROID)
28 #include "base/run_loop.h" 28 #include "base/run_loop.h"
29 #include "content/shell/shell_layout_tests_android.h" 29 #include "content/shell/browser/shell_layout_tests_android.h"
30 #endif 30 #endif
31 31
32 namespace { 32 namespace {
33 33
34 GURL GetURLForLayoutTest(const std::string& test_name, 34 GURL GetURLForLayoutTest(const std::string& test_name,
35 base::FilePath* current_working_directory, 35 base::FilePath* current_working_directory,
36 bool* enable_pixel_dumping, 36 bool* enable_pixel_dumping,
37 std::string* expected_pixel_hash) { 37 std::string* expected_pixel_hash) {
38 // A test name is formated like file:///path/to/test'--pixel-test'pixelhash 38 // A test name is formated like file:///path/to/test'--pixel-test'pixelhash
39 std::string path_or_url = test_name; 39 std::string path_or_url = test_name;
(...skipping 171 matching lines...) Expand 10 before | Expand all | Expand 10 after
211 211
212 #if !defined(OS_ANDROID) 212 #if !defined(OS_ANDROID)
213 if (!layout_test_mode) 213 if (!layout_test_mode)
214 exit_code = main_runner->Run(); 214 exit_code = main_runner->Run();
215 215
216 main_runner->Shutdown(); 216 main_runner->Shutdown();
217 #endif 217 #endif
218 218
219 return exit_code; 219 return exit_code;
220 } 220 }
OLDNEW
« no previous file with comments | « content/shell/browser/shell_browser_main.h ('k') | content/shell/browser/shell_browser_main_parts.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698