diff options
| author | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:55:30 +0000 |
|---|---|---|
| committer | evan@chromium.org <evan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-14 20:55:30 +0000 |
| commit | adda869f22b29e7c43c2d84efdda2919854ed608 (patch) | |
| tree | 9798ebe411388bacbd50a5798504f04ace15902b /chrome/test/ui_test_utils.cc | |
| parent | 81f5486a2aa70e059a76b6e0851bb55b2e3daf53 (diff) | |
| download | chromium_src-adda869f22b29e7c43c2d84efdda2919854ed608.zip chromium_src-adda869f22b29e7c43c2d84efdda2919854ed608.tar.gz chromium_src-adda869f22b29e7c43c2d84efdda2919854ed608.tar.bz2 | |
Clean up users of a deprecated base::LaunchApp API.
BUG=88990
Review URL: http://codereview.chromium.org/7351003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92598 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/test/ui_test_utils.cc')
| -rw-r--r-- | chrome/test/ui_test_utils.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/test/ui_test_utils.cc b/chrome/test/ui_test_utils.cc index d8f8c75..1fb3d3e 100644 --- a/chrome/test/ui_test_utils.cc +++ b/chrome/test/ui_test_utils.cc @@ -709,7 +709,9 @@ bool TestWebSocketServer::Start(const FilePath& root_directory) { cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") + websocket_pid_file_.value()); SetPythonPath(); - if (!base::LaunchApp(*cmd_line.get(), true, false, NULL)) { + base::LaunchOptions options; + options.wait = true; + if (!base::LaunchProcess(*cmd_line.get(), options)) { LOG(ERROR) << "Unable to launch websocket server."; return false; } @@ -761,7 +763,9 @@ TestWebSocketServer::~TestWebSocketServer() { cmd_line->AppendArg("--chromium"); cmd_line->AppendArgNative(FILE_PATH_LITERAL("--pidfile=") + websocket_pid_file_.value()); - base::LaunchApp(*cmd_line.get(), true, false, NULL); + base::LaunchOptions options; + options.wait = true; + base::LaunchProcess(*cmd_line.get(), options); } TestNotificationObserver::TestNotificationObserver() |