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

Unified Diff: third_party/mojo/src/mojo/edk/system/ipc_support.cc

Issue 1311043003: Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 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
Index: third_party/mojo/src/mojo/edk/system/ipc_support.cc
diff --git a/third_party/mojo/src/mojo/edk/system/ipc_support.cc b/third_party/mojo/src/mojo/edk/system/ipc_support.cc
index 424a130462ffed89b6066fea181bc6e16c09839f..7c4f3d45e288ff31558cfa3c6d2777cdf90f9677 100644
--- a/third_party/mojo/src/mojo/edk/system/ipc_support.cc
+++ b/third_party/mojo/src/mojo/edk/system/ipc_support.cc
@@ -141,8 +141,9 @@ embedder::ScopedPlatformHandle IPCSupport::ConnectToSlaveInternal(
system::ProcessIdentifier peer_id = system::kInvalidProcessIdentifier;
embedder::ScopedPlatformHandle platform_connection_handle;
- CHECK(connection_manager()->Connect(connection_id, &peer_id,
- &platform_connection_handle));
+ CHECK_EQ(connection_manager()->Connect(connection_id, &peer_id,
+ &platform_connection_handle),
+ ConnectionManager::Result::SUCCESS_CONNECT_NEW_CONNECTION);
DCHECK_EQ(peer_id, *slave_process_identifier);
DCHECK(platform_connection_handle.is_valid());
return platform_connection_handle;
@@ -154,8 +155,9 @@ embedder::ScopedPlatformHandle IPCSupport::ConnectToMasterInternal(
system::ProcessIdentifier peer_id;
embedder::ScopedPlatformHandle platform_connection_handle;
- CHECK(connection_manager()->Connect(connection_id, &peer_id,
- &platform_connection_handle));
+ CHECK_EQ(connection_manager()->Connect(connection_id, &peer_id,
+ &platform_connection_handle),
+ ConnectionManager::Result::SUCCESS_CONNECT_NEW_CONNECTION);
DCHECK_EQ(peer_id, system::kMasterProcessIdentifier);
DCHECK(platform_connection_handle.is_valid());
return platform_connection_handle;

Powered by Google App Engine
This is Rietveld 408576698