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

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

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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/master_connection_manager.cc
diff --git a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
index 4d7deaef555ee888b9b3100ea8bf6aadd941aa8e..b78dfb618fd83f24f854836d4aa0801c5f86765a 100644
--- a/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
+++ b/third_party/mojo/src/mojo/edk/system/master_connection_manager.cc
@@ -20,14 +20,9 @@
namespace mojo {
namespace system {
-const ProcessIdentifier kFirstSlaveProcessIdentifier = 2;
-
-static_assert(kMasterProcessIdentifier != kInvalidProcessIdentifier,
- "Bad master process identifier");
-static_assert(kFirstSlaveProcessIdentifier != kInvalidProcessIdentifier,
- "Bad first slave process identifier");
-static_assert(kMasterProcessIdentifier != kFirstSlaveProcessIdentifier,
- "Master and first slave process identifiers are the same");
+const ProcessIdentifier kFirstProcessIdentifier = 1;
+const ProcessIdentifier kMasterProcessIdentifier =
+ static_cast<ProcessIdentifier>(-1);
// MasterConnectionManager::Helper ---------------------------------------------
@@ -223,7 +218,7 @@ MasterConnectionManager::MasterConnectionManager()
: creation_thread_task_runner_(base::MessageLoop::current()->task_runner()),
master_process_delegate_(),
private_thread_("MasterConnectionManagerPrivateThread"),
- next_process_identifier_(kFirstSlaveProcessIdentifier) {
+ next_process_identifier_(kFirstProcessIdentifier) {
DCHECK(creation_thread_task_runner_);
AssertOnCreationThread(); // Just make sure this assertion works correctly.
}
« no previous file with comments | « third_party/mojo/src/mojo/edk/system/master_connection_manager.h ('k') | third_party/mojo/src/mojo/edk/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698