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_path.h" | 10 #include "base/file_path.h" |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
116 if (CommandLine::ForCurrentProcess()->HasSwitch( | 116 if (CommandLine::ForCurrentProcess()->HasSwitch( |
117 switches::kCheckLayoutTestSysDeps)) { | 117 switches::kCheckLayoutTestSysDeps)) { |
118 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); | 118 MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure()); |
119 main_runner_->Run(); | 119 main_runner_->Run(); |
120 main_runner_->Shutdown(); | 120 main_runner_->Shutdown(); |
121 return 0; | 121 return 0; |
122 } | 122 } |
123 | 123 |
124 if (layout_test_mode) { | 124 if (layout_test_mode) { |
125 content::WebKitTestController test_controller; | 125 content::WebKitTestController test_controller; |
| 126 { |
| 127 // We're outside of the message loop here, and this is a test. |
| 128 base::ThreadRestrictions::ScopedAllowIO allow_io; |
| 129 base::FilePath temp_path; |
| 130 file_util::GetTempDir(&temp_path); |
| 131 test_controller.SetTempPath(temp_path); |
| 132 } |
126 std::string test_string; | 133 std::string test_string; |
127 CommandLine::StringVector args = | 134 CommandLine::StringVector args = |
128 CommandLine::ForCurrentProcess()->GetArgs(); | 135 CommandLine::ForCurrentProcess()->GetArgs(); |
129 size_t command_line_position = 0; | 136 size_t command_line_position = 0; |
130 bool ran_at_least_once = false; | 137 bool ran_at_least_once = false; |
131 | 138 |
132 #if defined(OS_ANDROID) | 139 #if defined(OS_ANDROID) |
133 std::cout << "#READY\n"; | 140 std::cout << "#READY\n"; |
134 std::cout.flush(); | 141 std::cout.flush(); |
135 #endif | 142 #endif |
(...skipping 26 matching lines...) Expand all Loading... |
162 } | 169 } |
163 exit_code = 0; | 170 exit_code = 0; |
164 } else { | 171 } else { |
165 exit_code = main_runner_->Run(); | 172 exit_code = main_runner_->Run(); |
166 } | 173 } |
167 | 174 |
168 main_runner_->Shutdown(); | 175 main_runner_->Shutdown(); |
169 | 176 |
170 return exit_code; | 177 return exit_code; |
171 } | 178 } |
OLD | NEW |