Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2632)

Unified Diff: extensions/browser/mojo/stash_backend_unittest.cc

Issue 830593003: Update mojo sdk to rev 9fbbc4f0fef1187312316c0ed992342474e139f1 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: cherry-pick mojo 9d3b8dd17f12d20035a14737fdc38dd926890ff8 Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/android/findbugs_filter/findbugs_known_bugs.txt ('k') | ipc/mojo/async_handle_waiter_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/browser/mojo/stash_backend_unittest.cc
diff --git a/extensions/browser/mojo/stash_backend_unittest.cc b/extensions/browser/mojo/stash_backend_unittest.cc
index d44ff27cfe8d304fea7fff36317c28dec5809691..9d7f0947e649136444b0ad2410b16eb08db6066b 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);
}
« no previous file with comments | « build/android/findbugs_filter/findbugs_known_bugs.txt ('k') | ipc/mojo/async_handle_waiter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698