diff options
| author | rockot <rockot@chromium.org> | 2015-01-15 16:41:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-16 00:41:55 +0000 |
| commit | 6dcbf7cdd88395e3719f79753976841762969e0b (patch) | |
| tree | 49e91924d33902161b470ab1b0f6a7714d995b5e /extensions/browser/mojo | |
| parent | e20555d490b11357f0f178783a6e180e82e17468 (diff) | |
| download | chromium_src-6dcbf7cdd88395e3719f79753976841762969e0b.zip chromium_src-6dcbf7cdd88395e3719f79753976841762969e0b.tar.gz chromium_src-6dcbf7cdd88395e3719f79753976841762969e0b.tar.bz2 | |
Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1
BUG=None
TBR=jamesr@chromium.org
TBR=darin@chromium.org
Review URL: https://codereview.chromium.org/830593003
Cr-Commit-Position: refs/heads/master@{#311784}
Diffstat (limited to 'extensions/browser/mojo')
| -rw-r--r-- | extensions/browser/mojo/stash_backend_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc index d44ff27..9d7f094 100644 --- a/extensions/browser/mojo/stash_backend_unittest.cc +++ b/extensions/browser/mojo/stash_backend_unittest.cc @@ -130,7 +130,8 @@ TEST_F(StashServiceTest, StashAndRetrieveHandles) { consumer = mojo::ScopedDataPipeConsumerHandle::From( stashed_objects[0]->stashed_handles[1].Pass()); result = mojo::Wait( - consumer.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE); + consumer.get(), MOJO_HANDLE_SIGNAL_READABLE, MOJO_DEADLINE_INDEFINITE, + nullptr); ASSERT_EQ(MOJO_RESULT_OK, result); char data = '\0'; result = mojo::ReadDataRaw( @@ -167,7 +168,7 @@ TEST_F(StashServiceTest, ServiceWithDeletedBackend) { MojoResult result = mojo::Wait(message_pipe.handle1.get(), MOJO_HANDLE_SIGNAL_READABLE | MOJO_HANDLE_SIGNAL_READABLE, - MOJO_DEADLINE_INDEFINITE); + MOJO_DEADLINE_INDEFINITE, nullptr); EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION, result); } |