Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_
 
 #include <stdint.h>
 
 #include "base/containers/hash_tables.h"
 #include "base/memory/ref_counted.h"
+#include "base/synchronization/lock.h"
 #include "base/threading/thread.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/system/connection_manager.h"
-#include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace base {
 class TaskRunner;
 class WaitableEvent;
 }
 
 namespace mojo {
 
@@ skipping 18 matching lines @@
   // |platform_support| must be valid and remain alive until after |Shutdown()|
   // has completed.
   explicit MasterConnectionManager(embedder::PlatformSupport* platform_support);
   ~MasterConnectionManager() override;
 
   // No other methods may be called until after this has been called.
   // |delegate_thread_task_runner| should be the task runner for the "delegate
   // thread", on which |master_process_delegate|'s methods will be called. Both
   // must stay alive at least until after |Shutdown()| has been called.
   void Init(scoped_refptr<base::TaskRunner> delegate_thread_task_runner,
-            embedder::MasterProcessDelegate* master_process_delegate)
-      MOJO_NOT_THREAD_SAFE;
+            embedder::MasterProcessDelegate* master_process_delegate);
 
   // Adds a slave process and sets up/tracks a connection to that slave (using
   // |platform_handle|). |slave_info| is used by the caller/implementation of
   // |embedder::MasterProcessDelegate| to track this process. It must remain
   // alive until the delegate's |OnSlaveDisconnect()| is called with it as the
   // argument. |OnSlaveDisconnect()| will always be called for each slave,
   // assuming proper shutdown. Returns the process identifier for the
   // newly-added slave.
   ProcessIdentifier AddSlave(embedder::SlaveInfo slave_info,
                              embedder::ScopedPlatformHandle platform_handle);
 
   // Like |AddSlave()|, but allows a connection to be bootstrapped: both the
   // master and slave may call |Connect()| with |connection_id| immediately (as
   // if both had already called |AllowConnect()|). |connection_id| must be
   // unique (i.e., not previously used).
   // TODO(vtl): Is |AddSlave()| really needed? (It's probably mostly useful for
   // tests.)
   ProcessIdentifier AddSlaveAndBootstrap(
       embedder::SlaveInfo slave_info,
       embedder::ScopedPlatformHandle platform_handle,
       const ConnectionIdentifier& connection_id);
 
   // |ConnectionManager| methods:
-  void Shutdown() override MOJO_NOT_THREAD_SAFE;
+  void Shutdown() override;
   bool AllowConnect(const ConnectionIdentifier& connection_id) override;
   bool CancelConnect(const ConnectionIdentifier& connection_id) override;
-  Result Connect(const ConnectionIdentifier& connection_id,
-                 ProcessIdentifier* peer_process_identifier,
-                 embedder::ScopedPlatformHandle* platform_handle) override;
+  bool Connect(const ConnectionIdentifier& connection_id,
+               ProcessIdentifier* peer_process_identifier,
+               embedder::ScopedPlatformHandle* platform_handle) override;
 
  private:
   class Helper;
 
   // These should be thread-safe and may be called on any thread, including
   // |private_thread_|:
   bool AllowConnectImpl(ProcessIdentifier process_identifier,
                         const ConnectionIdentifier& connection_id);
   bool CancelConnectImpl(ProcessIdentifier process_identifier,
                          const ConnectionIdentifier& connection_id);
-  Result ConnectImpl(ProcessIdentifier process_identifier,
-                     const ConnectionIdentifier& connection_id,
-                     ProcessIdentifier* peer_process_identifier,
-                     embedder::ScopedPlatformHandle* platform_handle);
+  bool ConnectImpl(ProcessIdentifier process_identifier,
+                   const ConnectionIdentifier& connection_id,
+                   ProcessIdentifier* peer_process_identifier,
+                   embedder::ScopedPlatformHandle* platform_handle);
 
   // These should only be called on |private_thread_|:
-  void ShutdownOnPrivateThread() MOJO_NOT_THREAD_SAFE;
+  void ShutdownOnPrivateThread();
   // Signals |*event| on completion.
   void AddSlaveOnPrivateThread(embedder::SlaveInfo slave_info,
                                embedder::ScopedPlatformHandle platform_handle,
                                ProcessIdentifier slave_process_identifier,
                                base::WaitableEvent* event);
   // Called by |Helper::OnError()|.
   void OnError(ProcessIdentifier process_identifier);
   // Posts a call to |master_process_delegate_->OnSlaveDisconnect()|.
   void CallOnSlaveDisconnect(embedder::SlaveInfo slave_info);
 
@@ skipping 14 matching lines @@
   scoped_refptr<base::TaskRunner> delegate_thread_task_runner_;
   embedder::MasterProcessDelegate* master_process_delegate_;
 
   // This is a private I/O thread on which this class does the bulk of its work.
   // It is started in |Init()| and terminated in |Shutdown()|.
   base::Thread private_thread_;
 
   // The following members are only accessed on |private_thread_|:
   base::hash_map<ProcessIdentifier, Helper*> helpers_;  // Owns its values.
 
-  // Note: |mutex_| is not needed in the constructor, |Init()|,
-  // |Shutdown()|/|ShutdownOnPrivateThread()|, or the destructor
-  Mutex mutex_;
+  // Protects the members below (except in the constructor, |Init()|,
+  // |Shutdown()|/|ShutdownOnPrivateThread()|, and the destructor).
+  base::Lock lock_;
 
-  ProcessIdentifier next_process_identifier_ MOJO_GUARDED_BY(mutex_);
+  ProcessIdentifier next_process_identifier_;
 
   struct PendingConnectionInfo;
   base::hash_map<ConnectionIdentifier, PendingConnectionInfo*>
-      pending_connections_ MOJO_GUARDED_BY(mutex_);  // Owns its values.
+      pending_connections_;  // Owns its values.
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(MasterConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_MASTER_CONNECTION_MANAGER_H_