Skip to content

Commit

Permalink
Update apps/ to use the new version of LaunchProcess.
Browse files Browse the repository at this point in the history
BUG=417532

Review URL: https://codereview.chromium.org/788953002

Cr-Commit-Position: refs/heads/master@{#307617}
  • Loading branch information
rvargas authored and Commit bot committed Dec 10, 2014
1 parent 59bd86c commit 6bfa252
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions apps/load_and_launch_browsertest.cc
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
app_path.value());

new_cmdline.AppendSwitch(content::kLaunchAsBrowser);
base::ProcessHandle process;
base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest(), &process);
ASSERT_NE(base::kNullProcessHandle, process);
base::Process process =
base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest());
ASSERT_TRUE(process.IsValid());

ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_TRUE(base::WaitForSingleProcess(
process, TestTimeouts::action_timeout()));
ASSERT_TRUE(base::WaitForSingleProcess(process.Handle(),
TestTimeouts::action_timeout()));
}

// TODO(jackhou): Enable this test once it works on OSX. It currently does not
Expand Down Expand Up @@ -93,13 +93,13 @@ IN_PROC_BROWSER_TEST_F(PlatformAppBrowserTest,
new_cmdline.AppendSwitch(content::kLaunchAsBrowser);
new_cmdline.AppendArgPath(test_file_path);

base::ProcessHandle process;
base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest(), &process);
ASSERT_NE(base::kNullProcessHandle, process);
base::Process process =
base::LaunchProcess(new_cmdline, base::LaunchOptionsForTest());
ASSERT_TRUE(process.IsValid());

ASSERT_TRUE(launched_listener.WaitUntilSatisfied());
ASSERT_TRUE(base::WaitForSingleProcess(
process, TestTimeouts::action_timeout()));
ASSERT_TRUE(base::WaitForSingleProcess(process.Handle(),
TestTimeouts::action_timeout()));
}

namespace {
Expand Down

0 comments on commit 6bfa252

Please sign in to comment.