| OLD | NEW |
| 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/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.h" | 15 #include "base/message_loop.h" |
| 16 #include "base/strings/sys_string_conversions.h" | 16 #include "base/strings/sys_string_conversions.h" |
| 17 #include "base/threading/thread_restrictions.h" | 17 #include "base/threading/thread_restrictions.h" |
| 18 #include "base/utf_string_conversions.h" | 18 #include "base/utf_string_conversions.h" |
| 19 #include "content/public/browser/browser_main_runner.h" | 19 #include "content/public/browser/browser_main_runner.h" |
| 20 #include "content/shell/common/shell_switches.h" |
| 21 #include "content/shell/common/webkit_test_helpers.h" |
| 20 #include "content/shell/shell.h" | 22 #include "content/shell/shell.h" |
| 21 #include "content/shell/shell_switches.h" | |
| 22 #include "content/shell/webkit_test_controller.h" | 23 #include "content/shell/webkit_test_controller.h" |
| 23 #include "content/shell/webkit_test_helpers.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 namespace { | 27 namespace { |
| 28 | 28 |
| 29 GURL GetURLForLayoutTest(const std::string& test_name, | 29 GURL GetURLForLayoutTest(const std::string& test_name, |
| 30 base::FilePath* current_working_directory, | 30 base::FilePath* current_working_directory, |
| 31 bool* enable_pixel_dumping, | 31 bool* enable_pixel_dumping, |
| 32 std::string* expected_pixel_hash) { | 32 std::string* expected_pixel_hash) { |
| 33 // A test name is formated like file:///path/to/test'--pixel-test'pixelhash | 33 // A test name is formated like file:///path/to/test'--pixel-test'pixelhash |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 177 } | 177 } |
| 178 exit_code = 0; | 178 exit_code = 0; |
| 179 } else { | 179 } else { |
| 180 exit_code = main_runner_->Run(); | 180 exit_code = main_runner_->Run(); |
| 181 } | 181 } |
| 182 | 182 |
| 183 main_runner_->Shutdown(); | 183 main_runner_->Shutdown(); |
| 184 | 184 |
| 185 return exit_code; | 185 return exit_code; |
| 186 } | 186 } |
| OLD | NEW |