Update mojo sdk to rev 1dc8a9a5db73d3718d99917fadf31f5fb2ebad4f

third_party/mojo/src/mojo/edk/system/master_connection_manager.cc

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 f8dd7443a77ce3b84bdcbeb85237d486ebe0cff0..afd7f073c70f511e9eac98a21ea8626c000914fa 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
@@ -252,11 +252,20 @@ void MasterConnectionManager::Init(
 
 void MasterConnectionManager::AddSlave(
     embedder::SlaveInfo slave_info,
-    embedder::ScopedPlatformHandle platform_handle) {
+    embedder::ScopedPlatformHandle platform_handle,
+    ProcessIdentifier* slave_process_identifier) {
   // We don't really care if |slave_info| is non-null or not.
   DCHECK(platform_handle.is_valid());
+  DCHECK(slave_process_identifier);
   AssertNotOnPrivateThread();
 
+  {
+    base::AutoLock locker(lock_);
+    CHECK_NE(next_process_identifier_, kMasterProcessIdentifier);
+    *slave_process_identifier = next_process_identifier_;
+    next_process_identifier_++;
+  }
+
   // We have to wait for the task to be executed, in case someone calls
   // |AddSlave()| followed immediately by |Shutdown()|.
   base::WaitableEvent event(false, false);
@@ -264,10 +273,32 @@ void MasterConnectionManager::AddSlave(
       FROM_HERE,
       base::Bind(&MasterConnectionManager::AddSlaveOnPrivateThread,
                  base::Unretained(this), base::Unretained(slave_info),
-                 base::Passed(&platform_handle), base::Unretained(&event)));
+                 base::Passed(&platform_handle), *slave_process_identifier,
+                 base::Unretained(&event)));
   event.Wait();
 }
 
+bool MasterConnectionManager::AddSlaveAndBootstrap(
+    embedder::SlaveInfo slave_info,
+    embedder::ScopedPlatformHandle platform_handle,
+    const ConnectionIdentifier& connection_id,
+    ProcessIdentifier* slave_process_identifier) {
+  AddSlave(slave_info, platform_handle.Pass(), slave_process_identifier);
+
+  base::AutoLock locker(lock_);
+
+  auto it = pending_connections_.find(connection_id);
+  if (it != pending_connections_.end())
+    return false;
+
+  PendingConnectionInfo* info =
+      new PendingConnectionInfo(kMasterProcessIdentifier);
+  info->state = PendingConnectionInfo::AWAITING_CONNECTS_FROM_BOTH;
+  info->second = *slave_process_identifier;
+  pending_connections_[connection_id] = info;
+  return true;
+}
+
 void MasterConnectionManager::Shutdown() {
   AssertNotOnPrivateThread();
   DCHECK(master_process_delegate_);
@@ -318,7 +349,7 @@ bool MasterConnectionManager::AllowConnectImpl(
         new PendingConnectionInfo(process_identifier);
     // TODO(vtl): Track process identifier -> pending connections also (so these
     // can be removed efficiently if that process disconnects).
-    DVLOG(1) << "New pending connection ID " << connection_id
+    DVLOG(1) << "New pending connection ID " << connection_id.ToString()
              << ": AllowConnect() from first process identifier "
              << process_identifier;
     return true;
@@ -328,7 +359,7 @@ bool MasterConnectionManager::AllowConnectImpl(
   if (info->state == PendingConnectionInfo::AWAITING_SECOND_ALLOW_CONNECT) {
     info->state = PendingConnectionInfo::AWAITING_CONNECTS_FROM_BOTH;
     info->second = process_identifier;
-    DVLOG(1) << "Pending connection ID " << connection_id
+    DVLOG(1) << "Pending connection ID " << connection_id.ToString()
              << ": AllowConnect() from second process identifier "
              << process_identifier;
     return true;
@@ -337,8 +368,8 @@ bool MasterConnectionManager::AllowConnectImpl(
   // Someone's behaving badly, but we don't know who (it might not be the
   // caller).
   LOG(ERROR) << "AllowConnect() from process " << process_identifier
-             << " for connection ID " << connection_id << " already in state "
-             << info->state;
+             << " for connection ID " << connection_id.ToString()
+             << " already in state " << info->state;
   pending_connections_.erase(it);
   delete info;
   return false;
@@ -355,7 +386,7 @@ bool MasterConnectionManager::CancelConnectImpl(
   if (it == pending_connections_.end()) {
     // Not necessarily the caller's fault, and not necessarily an error.
     DVLOG(1) << "CancelConnect() from process " << process_identifier
-             << " for connection ID " << connection_id
+             << " for connection ID " << connection_id.ToString()
              << " which is not (or no longer) pending";
     return true;
   }
@@ -363,7 +394,7 @@ bool MasterConnectionManager::CancelConnectImpl(
   PendingConnectionInfo* info = it->second;
   if (process_identifier != info->first && process_identifier != info->second) {
     LOG(ERROR) << "CancelConnect() from process " << process_identifier
-               << " for connection ID " << connection_id
+               << " for connection ID " << connection_id.ToString()
                << " which is neither connectee";
     return false;
   }
@@ -392,7 +423,7 @@ bool MasterConnectionManager::ConnectImpl(
   if (it == pending_connections_.end()) {
     // Not necessarily the caller's fault.
     LOG(ERROR) << "Connect() from process " << process_identifier
-               << " for connection ID " << connection_id
+               << " for connection ID " << connection_id.ToString()
                << " which is not pending";
     return false;
   }
@@ -409,7 +440,7 @@ bool MasterConnectionManager::ConnectImpl(
       *peer_process_identifier = info->first;
     } else {
       LOG(ERROR) << "Connect() from process " << process_identifier
-                 << " for connection ID " << connection_id
+                 << " for connection ID " << connection_id.ToString()
                  << " which is neither connectee";
       return false;
     }
@@ -424,7 +455,7 @@ bool MasterConnectionManager::ConnectImpl(
       info->remaining_handle = platform_channel_pair.PassClientHandle();
       DCHECK(info->remaining_handle.is_valid());
     }
-    DVLOG(1) << "Connection ID " << connection_id
+    DVLOG(1) << "Connection ID " << connection_id.ToString()
              << ": first Connect() from process identifier "
              << process_identifier;
     return true;
@@ -443,8 +474,8 @@ bool MasterConnectionManager::ConnectImpl(
     // Someone's behaving badly, but we don't know who (it might not be the
     // caller).
     LOG(ERROR) << "Connect() from process " << process_identifier
-               << " for connection ID " << connection_id << " in state "
-               << info->state;
+               << " for connection ID " << connection_id.ToString()
+               << " in state " << info->state;
     pending_connections_.erase(it);
     delete info;
     return false;
@@ -452,7 +483,7 @@ bool MasterConnectionManager::ConnectImpl(
 
   if (process_identifier != remaining_connectee) {
     LOG(ERROR) << "Connect() from process " << process_identifier
-               << " for connection ID " << connection_id
+               << " for connection ID " << connection_id.ToString()
                << " which is not the remaining connectee";
     pending_connections_.erase(it);
     delete info;
@@ -464,7 +495,7 @@ bool MasterConnectionManager::ConnectImpl(
   DCHECK((info->first == info->second) ^ platform_handle->is_valid());
   pending_connections_.erase(it);
   delete info;
-  DVLOG(1) << "Connection ID " << connection_id
+  DVLOG(1) << "Connection ID " << connection_id.ToString()
            << ": second Connect() from process identifier "
            << process_identifier;
   return true;
@@ -494,23 +525,20 @@ void MasterConnectionManager::ShutdownOnPrivateThread() {
 void MasterConnectionManager::AddSlaveOnPrivateThread(
     embedder::SlaveInfo slave_info,
     embedder::ScopedPlatformHandle platform_handle,
+    ProcessIdentifier slave_process_identifier,
     base::WaitableEvent* event) {
   DCHECK(platform_handle.is_valid());
   DCHECK(event);
   AssertOnPrivateThread();
 
-  CHECK_NE(next_process_identifier_, kMasterProcessIdentifier);
-  ProcessIdentifier process_identifier = next_process_identifier_;
-  next_process_identifier_++;
-
-  scoped_ptr<Helper> helper(
-      new Helper(this, process_identifier, slave_info, platform_handle.Pass()));
+  scoped_ptr<Helper> helper(new Helper(this, slave_process_identifier,
+                                       slave_info, platform_handle.Pass()));
   helper->Init();
 
-  DCHECK(helpers_.find(process_identifier) == helpers_.end());
-  helpers_[process_identifier] = helper.release();
+  DCHECK(helpers_.find(slave_process_identifier) == helpers_.end());
+  helpers_[slave_process_identifier] = helper.release();
 
-  DVLOG(1) << "Added process identifier " << process_identifier;
+  DVLOG(1) << "Added slave process identifier " << slave_process_identifier;
   event->Signal();
 }