Revert of Update mojo sdk to rev c02a28868825edfa57ab77947b8cb15e741c5598

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

Index: third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
diff --git a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
index b2cd92cd08278415b43bb767cb950f95fa192491..40fc79bf2ff7c53be72b6f0d8dfda8ecfe175b46 100644
--- a/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
+++ b/third_party/mojo/src/mojo/edk/system/slave_connection_manager.h
@@ -7,12 +7,12 @@
 
 #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"
@@ -58,20 +58,20 @@
   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:
   // These should only be called on |private_thread_|:
   void InitOnPrivateThread(embedder::ScopedPlatformHandle platform_handle);
   void ShutdownOnPrivateThread();
   void AllowConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                                   Result* result);
+                                   bool* result);
   void CancelConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                                    Result* result);
+                                    bool* result);
   void ConnectOnPrivateThread(const ConnectionIdentifier& connection_id,
-                              Result* result,
+                              bool* result,
                               ProcessIdentifier* peer_process_identifier,
                               embedder::ScopedPlatformHandle* platform_handle);
 
@@ -112,7 +112,7 @@
     AWAITING_CONNECT_ACK
   };
   AwaitingAckType awaiting_ack_type_;
-  Result* ack_result_;
+  bool* ack_result_;
   // Used only when waiting for the ack to "connect":
   ProcessIdentifier* ack_peer_process_identifier_;
   embedder::ScopedPlatformHandle* ack_platform_handle_;
@@ -143,7 +143,7 @@
   //
   // TODO(vtl): This is all a hack. It'd really suffice to have a version of
   // |RawChannel| with fully synchronous reading and writing.
-  Mutex mutex_;
+  base::Lock lock_;
   base::WaitableEvent event_;
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(SlaveConnectionManager);