| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/test/ui/ui_test.h" | 5 #include "chrome/test/ui/ui_test.h" |
| 6 | 6 |
| 7 #if defined(OS_POSIX) | 7 #if defined(OS_POSIX) |
| 8 #include <signal.h> | 8 #include <signal.h> |
| 9 #include <sys/types.h> | 9 #include <sys/types.h> |
| 10 #endif | 10 #endif |
| (...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1202 wait, | 1202 wait, |
| 1203 !show_window_, | 1203 !show_window_, |
| 1204 process); | 1204 process); |
| 1205 #elif defined(OS_POSIX) | 1205 #elif defined(OS_POSIX) |
| 1206 // Sometimes one needs to run the browser under a special environment | 1206 // Sometimes one needs to run the browser under a special environment |
| 1207 // (e.g. valgrind) without also running the test harness (e.g. python) | 1207 // (e.g. valgrind) without also running the test harness (e.g. python) |
| 1208 // under the special environment. Provide a way to wrap the browser | 1208 // under the special environment. Provide a way to wrap the browser |
| 1209 // commandline with a special prefix to invoke the special environment. | 1209 // commandline with a special prefix to invoke the special environment. |
| 1210 const char* browser_wrapper = getenv("BROWSER_WRAPPER"); | 1210 const char* browser_wrapper = getenv("BROWSER_WRAPPER"); |
| 1211 if (browser_wrapper) { | 1211 if (browser_wrapper) { |
| 1212 command_line.PrependWrapper(ASCIIToWide(browser_wrapper)); | 1212 command_line.PrependWrapper(browser_wrapper); |
| 1213 LOG(INFO) << "BROWSER_WRAPPER was set, prefixing command_line with " | 1213 LOG(INFO) << "BROWSER_WRAPPER was set, prefixing command_line with " |
| 1214 << browser_wrapper; | 1214 << browser_wrapper; |
| 1215 } | 1215 } |
| 1216 | 1216 |
| 1217 bool started = base::LaunchApp(command_line.argv(), | 1217 bool started = base::LaunchApp(command_line.argv(), |
| 1218 server_->fds_to_map(), | 1218 server_->fds_to_map(), |
| 1219 wait, | 1219 wait, |
| 1220 process); | 1220 process); |
| 1221 #endif | 1221 #endif |
| 1222 | 1222 |
| (...skipping 298 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1521 test_info->name()); | 1521 test_info->name()); |
| 1522 } | 1522 } |
| 1523 UITestBase::SetUp(); | 1523 UITestBase::SetUp(); |
| 1524 PlatformTest::SetUp(); | 1524 PlatformTest::SetUp(); |
| 1525 } | 1525 } |
| 1526 | 1526 |
| 1527 void UITest::TearDown() { | 1527 void UITest::TearDown() { |
| 1528 UITestBase::TearDown(); | 1528 UITestBase::TearDown(); |
| 1529 PlatformTest::TearDown(); | 1529 PlatformTest::TearDown(); |
| 1530 } | 1530 } |
| OLD | NEW |