diff options
| author | jamesr <jamesr@chromium.org> | 2014-11-18 17:35:28 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 01:35:49 +0000 |
| commit | a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f (patch) | |
| tree | 954602a17f1bfd7fd9d10c255360f75a6ada0d28 /mojo/edk/test/multiprocess_test_helper.cc | |
| parent | 558999147d4fdfd1ae7ee79cfa1c6599eab47d57 (diff) | |
| download | chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.zip chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.gz chromium_src-a9125266d3fc89ff0bfd4c3a05bf2f31ffaeff1f.tar.bz2 | |
Update mojo sdk to rev e01f9a49449381a5eb430c1fd88bf2cae73ec35a
Includes updates to ipc/mojo/ipc_channel_mojo.cc for mojo::embedder API
changes and updates to use mojo::Binding<> in ui/keyboard and
device/battery.
Review URL: https://codereview.chromium.org/728133002
Cr-Commit-Position: refs/heads/master@{#304731}
Diffstat (limited to 'mojo/edk/test/multiprocess_test_helper.cc')
| -rw-r--r-- | mojo/edk/test/multiprocess_test_helper.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/edk/test/multiprocess_test_helper.cc b/mojo/edk/test/multiprocess_test_helper.cc index 02367d6..30aa0be 100644 --- a/mojo/edk/test/multiprocess_test_helper.cc +++ b/mojo/edk/test/multiprocess_test_helper.cc @@ -60,8 +60,8 @@ int MultiprocessTestHelper::WaitForChildShutdown() { CHECK_NE(test_child_handle_, base::kNullProcessHandle); int rv = -1; - CHECK(base::WaitForExitCodeWithTimeout( - test_child_handle_, &rv, TestTimeouts::action_timeout())); + CHECK(base::WaitForExitCodeWithTimeout(test_child_handle_, &rv, + TestTimeouts::action_timeout())); base::CloseProcessHandle(test_child_handle_); test_child_handle_ = base::kNullProcessHandle; return rv; |