Add a Mojo EDK for Chrome that uses one OS pipe per message pipe.

mojo/edk/system/dispatcher_unittest.cc

 // Copyright 2013 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.
 
-#include "third_party/mojo/src/mojo/edk/system/dispatcher.h"
+#include "mojo/edk/system/dispatcher.h"
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
+#include "mojo/edk/embedder/platform_shared_buffer.h"
+#include "mojo/edk/system/waiter.h"
 #include "mojo/public/cpp/system/macros.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "third_party/mojo/src/mojo/edk/embedder/platform_shared_buffer.h"
-#include "third_party/mojo/src/mojo/edk/system/memory.h"
-#include "third_party/mojo/src/mojo/edk/system/waiter.h"
 
 namespace mojo {
-namespace system {
+namespace edk {
 namespace {
 
 // Trivial subclass that makes the constructor public.
 class TrivialDispatcher final : public Dispatcher {
  public:
   TrivialDispatcher() {}
 
   Type GetType() const override { return Type::UNKNOWN; }
 
  private:
   friend class base::RefCountedThreadSafe<TrivialDispatcher>;
   ~TrivialDispatcher() override {}
 
   scoped_refptr<Dispatcher> CreateEquivalentDispatcherAndCloseImplNoLock()
       override {
-    mutex().AssertHeld();
+    lock().AssertAcquired();
     return scoped_refptr<Dispatcher>(new TrivialDispatcher());
   }
 
   MOJO_DISALLOW_COPY_AND_ASSIGN(TrivialDispatcher);
 };
 
 TEST(DispatcherTest, Basic) {
   scoped_refptr<Dispatcher> d(new TrivialDispatcher());
 
   EXPECT_EQ(Dispatcher::Type::UNKNOWN, d->GetType());
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->WriteMessage(NullUserPointer(), 0, nullptr,
-                            MOJO_WRITE_MESSAGE_FLAG_NONE));
+            d->WriteMessage(nullptr, 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->ReadMessage(NullUserPointer(), NullUserPointer(), nullptr,
-                           nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
+            d->ReadMessage(nullptr, nullptr, nullptr, nullptr,
+                           MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->WriteData(NullUserPointer(), NullUserPointer(),
-                         MOJO_WRITE_DATA_FLAG_NONE));
+            d->WriteData(nullptr, nullptr, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->BeginWriteData(NullUserPointer(), NullUserPointer(),
-                              MOJO_WRITE_DATA_FLAG_NONE));
+            d->BeginWriteData(nullptr, nullptr, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->ReadData(NullUserPointer(), NullUserPointer(),
-                        MOJO_READ_DATA_FLAG_NONE));
+            d->ReadData(nullptr, nullptr, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->BeginReadData(NullUserPointer(), NullUserPointer(),
-                             MOJO_READ_DATA_FLAG_NONE));
+            d->BeginReadData(nullptr, nullptr, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndReadData(0));
   Waiter w;
   w.Init();
   HandleSignalsState hss;
   EXPECT_EQ(MOJO_RESULT_FAILED_PRECONDITION,
             d->AddAwakable(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss));
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   // Okay to remove even if it wasn't added (or was already removed).
   hss = HandleSignalsState();
   d->RemoveAwakable(&w, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   hss = HandleSignalsState();
   d->RemoveAwakable(&w, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
 
   EXPECT_EQ(MOJO_RESULT_OK, d->Close());
 
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->WriteMessage(NullUserPointer(), 0, nullptr,
-                            MOJO_WRITE_MESSAGE_FLAG_NONE));
+            d->WriteMessage(nullptr, 0, nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->ReadMessage(NullUserPointer(), NullUserPointer(), nullptr,
-                           nullptr, MOJO_WRITE_MESSAGE_FLAG_NONE));
+            d->ReadMessage(nullptr, nullptr, nullptr, nullptr,  
+                           MOJO_WRITE_MESSAGE_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->WriteData(NullUserPointer(), NullUserPointer(),
-                         MOJO_WRITE_DATA_FLAG_NONE));
+            d->WriteData(nullptr, nullptr, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->BeginWriteData(NullUserPointer(), NullUserPointer(),
-                              MOJO_WRITE_DATA_FLAG_NONE));
+            d->BeginWriteData(nullptr, nullptr, MOJO_WRITE_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndWriteData(0));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->ReadData(NullUserPointer(), NullUserPointer(),
-                        MOJO_READ_DATA_FLAG_NONE));
+            d->ReadData(nullptr, nullptr, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-            d->BeginReadData(NullUserPointer(), NullUserPointer(),
-                             MOJO_READ_DATA_FLAG_NONE));
+            d->BeginReadData(nullptr, nullptr, MOJO_READ_DATA_FLAG_NONE));
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, d->EndReadData(0));
   hss = HandleSignalsState();
   EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
             d->AddAwakable(&w, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss));
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
   hss = HandleSignalsState();
   d->RemoveAwakable(&w, &hss);
   EXPECT_EQ(0u, hss.satisfied_signals);
   EXPECT_EQ(0u, hss.satisfiable_signals);
@@ skipping 38 matching lines @@
     waiter_.Init();
     switch (op_) {
       case CLOSE: {
         MojoResult r = dispatcher_->Close();
         EXPECT_TRUE(r == MOJO_RESULT_OK || r == MOJO_RESULT_INVALID_ARGUMENT)
             << "Result: " << r;
         break;
       }
       case WRITE_MESSAGE:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-                  dispatcher_->WriteMessage(NullUserPointer(), 0, nullptr,
+                  dispatcher_->WriteMessage(nullptr, 0, nullptr,
                                             MOJO_WRITE_MESSAGE_FLAG_NONE));
         break;
       case READ_MESSAGE:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-                  dispatcher_->ReadMessage(NullUserPointer(), NullUserPointer(),
-                                           nullptr, nullptr,
+                  dispatcher_->ReadMessage(nullptr, nullptr, nullptr, nullptr,
                                            MOJO_WRITE_MESSAGE_FLAG_NONE));
         break;
       case WRITE_DATA:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-                  dispatcher_->WriteData(NullUserPointer(), NullUserPointer(),
+                  dispatcher_->WriteData(nullptr, nullptr,
                                          MOJO_WRITE_DATA_FLAG_NONE));
         break;
       case BEGIN_WRITE_DATA:
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
-            dispatcher_->BeginWriteData(NullUserPointer(), NullUserPointer(),
+            dispatcher_->BeginWriteData(nullptr, nullptr,
                                         MOJO_WRITE_DATA_FLAG_NONE));
         break;
       case END_WRITE_DATA:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, dispatcher_->EndWriteData(0));
         break;
       case READ_DATA:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT,
-                  dispatcher_->ReadData(NullUserPointer(), NullUserPointer(),
+                  dispatcher_->ReadData(nullptr, nullptr,
                                         MOJO_READ_DATA_FLAG_NONE));
         break;
       case BEGIN_READ_DATA:
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
-            dispatcher_->BeginReadData(NullUserPointer(), NullUserPointer(),
+            dispatcher_->BeginReadData(nullptr, nullptr,
                                        MOJO_READ_DATA_FLAG_NONE));
         break;
       case END_READ_DATA:
         EXPECT_EQ(MOJO_RESULT_INVALID_ARGUMENT, dispatcher_->EndReadData(0));
         break;
       case DUPLICATE_BUFFER_HANDLE: {
         scoped_refptr<Dispatcher> unused;
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
-            dispatcher_->DuplicateBufferHandle(NullUserPointer(), &unused));
+            dispatcher_->DuplicateBufferHandle(nullptr, &unused));
         break;
       }
       case MAP_BUFFER: {
-        scoped_ptr<embedder::PlatformSharedBufferMapping> unused;
+        scoped_ptr<PlatformSharedBufferMapping> unused;
         EXPECT_EQ(
             MOJO_RESULT_INVALID_ARGUMENT,
             dispatcher_->MapBuffer(0u, 0u, MOJO_MAP_BUFFER_FLAG_NONE, &unused));
         break;
       }
       case ADD_WAITER: {
         HandleSignalsState hss;
         MojoResult r = dispatcher_->AddAwakable(
             &waiter_, ~MOJO_HANDLE_SIGNAL_NONE, 0, &hss);
         EXPECT_TRUE(r == MOJO_RESULT_FAILED_PRECONDITION ||
@@ skipping 78 matching lines @@
       }
       // Kicks off real work on the threads:
       event.Signal();
     }  // Joins all the threads.
 
     EXPECT_EQ(MOJO_RESULT_OK, d->Close());
   }
 }
 
 }  // namespace
-}  // namespace system
+}  // namespace edk
 }  // namespace mojo