Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

third_party/mojo/src/mojo/edk/system/slave_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_SLAVE_CONNECTION_MANAGER_H_
 #define MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/synchronization/lock.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/thread.h"
 #include "mojo/edk/embedder/scoped_platform_handle.h"
 #include "mojo/edk/embedder/slave_process_delegate.h"
 #include "mojo/edk/system/connection_manager.h"
+#include "mojo/edk/system/mutex.h"
 #include "mojo/edk/system/raw_channel.h"
 #include "mojo/edk/system/system_impl_export.h"
 #include "mojo/public/cpp/system/macros.h"
 
 namespace base {
 class TaskRunner;
 }
 
 namespace mojo {
 
@@ skipping 25 matching lines @@
   // thread", on which |slave_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::SlaveProcessDelegate* slave_process_delegate,
             embedder::ScopedPlatformHandle platform_handle);
 
   // |ConnectionManager| methods:
   void Shutdown() override;
   bool AllowConnect(const ConnectionIdentifier& connection_id) override;
   bool CancelConnect(const ConnectionIdentifier& connection_id) override;
-  bool Connect(const ConnectionIdentifier& connection_id,
-               ProcessIdentifier* peer_process_identifier,
-               embedder::ScopedPlatformHandle* platform_handle) override;
+  Result Connect(const ConnectionIdentifier& connection_id,
+                 ProcessIdentifier* peer_process_identifier,
+                 embedder::ScopedPlatformHandle* platform_handle) override;
 
  private:
   // These should only be called on |private_thread_|:
   void InitOnPrivateThread(embedder::ScopedPlatformHandle platform_handle);
   void ShutdownOnPrivateThread();
   void AllowConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                                   bool* result);
+                                   Result* result);
   void CancelConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                                    bool* result);
+                                    Result* result);
   void ConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                              bool* result,
+                              Result* result,
                               ProcessIdentifier* peer_process_identifier,
                               embedder::ScopedPlatformHandle* platform_handle);
 
   // |RawChannel::Delegate| methods (only called on |private_thread_|):
   void OnReadMessage(
       const MessageInTransit::View& message_view,
       embedder::ScopedPlatformHandleVectorPtr platform_handles) override;
   void OnError(Error error) override;
 
   // Asserts that the current thread is *not* |private_thread_| (no-op if
@@ skipping 20 matching lines @@
 
   // Only accessed on |private_thread_|:
   scoped_ptr<RawChannel> raw_channel_;
   enum AwaitingAckType {
     NOT_AWAITING_ACK,
     AWAITING_ACCEPT_CONNECT_ACK,
     AWAITING_CANCEL_CONNECT_ACK,
     AWAITING_CONNECT_ACK
   };
   AwaitingAckType awaiting_ack_type_;
-  bool* ack_result_;
+  Result* ack_result_;
   // Used only when waiting for the ack to "connect":
   ProcessIdentifier* ack_peer_process_identifier_;
   embedder::ScopedPlatformHandle* ack_platform_handle_;
 
   // The (synchronous) |ConnectionManager| methods are implemented in the
   // following way (T is any thread other than |private_thread_|):
   //
   // On thread T:
   //  1. |F()| is called, where F is one of the |ConnectionManager| methods.
   //  2. |lock_| is acquired.
@@ skipping 10 matching lines @@
   //  4.4. |*ack_result_| and possibly |*ack_platform_handle_| are written to.
   //       |awaiting_ack_type_| is "unset".
   //  4.5. |event_| is triggered.
   //
   // Back on thread T:
   //  6. |lock_| is released.
   //  7. [Return from |F()|.]
   //
   // TODO(vtl): This is all a hack. It'd really suffice to have a version of
   // |RawChannel| with fully synchronous reading and writing.
-  base::Lock lock_;
+  Mutex mutex_;
   base::WaitableEvent event_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(SlaveConnectionManager);
 };
 
 }  // namespace system
 }  // namespace mojo
 
 #endif  // MOJO_EDK_SYSTEM_SLAVE_CONNECTION_MANAGER_H_