Move more Mojo bindings helpers out of internal namespace

mojo/public/cpp/bindings/tests/connector_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 "mojo/public/cpp/bindings/lib/connector.h"
+#include "mojo/public/cpp/bindings/connector.h"
 
 #include <stddef.h>
 #include <stdlib.h>
 #include <string.h>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/callback_helpers.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 28 matching lines @@
 
   size_t size() const { return queue_.size(); }
 
  private:
   MessageQueue queue_;
   base::Closure closure_;
 };
 
 class ConnectorDeletingMessageAccumulator : public MessageAccumulator {
  public:
-  ConnectorDeletingMessageAccumulator(internal::Connector** connector)
+  ConnectorDeletingMessageAccumulator(Connector** connector)
       : connector_(connector) {}
 
   bool Accept(Message* message) override {
     delete *connector_;
     *connector_ = nullptr;
     return MessageAccumulator::Accept(message);
   }
 
  private:
-  internal::Connector** connector_;
+  Connector** connector_;
 };
 
 class ReentrantMessageAccumulator : public MessageAccumulator {
  public:
-  ReentrantMessageAccumulator(internal::Connector* connector)
+  ReentrantMessageAccumulator(Connector* connector)
       : connector_(connector), number_of_calls_(0) {}
 
   bool Accept(Message* message) override {
     if (!MessageAccumulator::Accept(message))
       return false;
     number_of_calls_++;
     if (number_of_calls_ == 1) {
       return connector_->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
     }
     return true;
   }
 
   int number_of_calls() { return number_of_calls_; }
 
  private:
-  internal::Connector* connector_;
+  Connector* connector_;
   int number_of_calls_;
 };
 
 class ConnectorTest : public testing::Test {
  public:
   ConnectorTest() {}
 
   void SetUp() override {
     CreateMessagePipe(nullptr, &handle0_, &handle1_);
   }
@@ skipping 10 matching lines @@
 
  protected:
   ScopedMessagePipeHandle handle0_;
   ScopedMessagePipeHandle handle1_;
 
  private:
   base::MessageLoop loop_;
 };
 
 TEST_F(ConnectorTest, Basic) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
   base::RunLoop run_loop;
   MessageAccumulator accumulator(run_loop.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, Basic_Synchronous) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
   MessageAccumulator accumulator;
   connector1.set_incoming_receiver(&accumulator);
 
   connector1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, Basic_EarlyIncomingReceiver) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   base::RunLoop run_loop;
   MessageAccumulator accumulator(run_loop.QuitClosure());
   connector1.set_incoming_receiver(&accumulator);
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
   run_loop.Run();
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, Basic_TwoMessages) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char* kText[] = {"hello", "world"};
 
   for (size_t i = 0; i < arraysize(kText); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
@@ skipping 11 matching lines @@
     Message message_received;
     accumulator.Pop(&message_received);
 
     EXPECT_EQ(
         std::string(kText[i]),
         std::string(reinterpret_cast<const char*>(message_received.payload())));
   }
 }
 
 TEST_F(ConnectorTest, Basic_TwoMessages_Synchronous) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char* kText[] = {"hello", "world"};
 
   for (size_t i = 0; i < arraysize(kText); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
   MessageAccumulator accumulator;
   connector1.set_incoming_receiver(&accumulator);
 
   connector1.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
 
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText[0]),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 
   ASSERT_TRUE(accumulator.IsEmpty());
 }
 
 TEST_F(ConnectorTest, WriteToClosedPipe) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   // Close the other end of the pipe.
   handle1_.reset();
 
   // Not observed yet because we haven't spun the message loop yet.
   EXPECT_FALSE(connector0.encountered_error());
 
   // Write failures are not reported.
   bool ok = connector0.Accept(&message);
   EXPECT_TRUE(ok);
 
   // Still not observed.
   EXPECT_FALSE(connector0.encountered_error());
 
   // Spin the message loop, and then we should start observing the closed pipe.
   base::RunLoop run_loop;
   connector0.set_connection_error_handler(run_loop.QuitClosure());
   run_loop.Run();
 
   EXPECT_TRUE(connector0.encountered_error());
 }
 
 TEST_F(ConnectorTest, MessageWithHandles) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   Message message1;
   AllocMessage(kText, &message1);
 
   MessagePipe pipe;
   message1.mutable_handles()->push_back(pipe.handle0.release());
 
   connector0.Accept(&message1);
@@ skipping 18 matching lines @@
   ASSERT_EQ(1U, message_received.handles()->size());
 
   // Now send a message to the transferred handle and confirm it's sent through
   // to the orginal pipe.
   // TODO(vtl): Do we need a better way of "downcasting" the handle types?
   ScopedMessagePipeHandle smph;
   smph.reset(MessagePipeHandle(message_received.handles()->front().value()));
   message_received.mutable_handles()->front() = Handle();
   // |smph| now owns this handle.
 
-  internal::Connector connector_received(
-      std::move(smph), internal::Connector::SINGLE_THREADED_SEND,
-      base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector_original(
-      std::move(pipe.handle1), internal::Connector::SINGLE_THREADED_SEND,
-      base::ThreadTaskRunnerHandle::Get());
+  Connector connector_received(std::move(smph), Connector::SINGLE_THREADED_SEND,
+                               base::ThreadTaskRunnerHandle::Get());
+  Connector connector_original(std::move(pipe.handle1),
+                               Connector::SINGLE_THREADED_SEND,
+                               base::ThreadTaskRunnerHandle::Get());
 
   Message message2;
   AllocMessage(kText, &message2);
 
   connector_received.Accept(&message2);
   base::RunLoop run_loop2;
   MessageAccumulator accumulator2(run_loop2.QuitClosure());
   connector_original.set_incoming_receiver(&accumulator2);
   run_loop2.Run();
 
   ASSERT_FALSE(accumulator2.IsEmpty());
 
   accumulator2.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, WaitForIncomingMessageWithError) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
   // Close the other end of the pipe.
   handle1_.reset();
   ASSERT_FALSE(connector0.WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE));
 }
 
 TEST_F(ConnectorTest, WaitForIncomingMessageWithDeletion) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector* connector1 = new internal::Connector(
-      std::move(handle1_), internal::Connector::SINGLE_THREADED_SEND,
-      base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector* connector1 =
+      new Connector(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                    base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
   connector0.Accept(&message);
 
   ConnectorDeletingMessageAccumulator accumulator(&connector1);
   connector1->set_incoming_receiver(&accumulator);
 
   connector1->WaitForIncomingMessage(MOJO_DEADLINE_INDEFINITE);
 
   ASSERT_FALSE(connector1);
   ASSERT_FALSE(accumulator.IsEmpty());
 
   Message message_received;
   accumulator.Pop(&message_received);
 
   EXPECT_EQ(
       std::string(kText),
       std::string(reinterpret_cast<const char*>(message_received.payload())));
 }
 
 TEST_F(ConnectorTest, WaitForIncomingMessageWithReentrancy) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char* kText[] = {"hello", "world"};
 
   for (size_t i = 0; i < arraysize(kText); ++i) {
     Message message;
     AllocMessage(kText[i], &message);
 
     connector0.Accept(&message);
   }
 
@@ skipping 19 matching lines @@
   ASSERT_EQ(2, accumulator.number_of_calls());
 }
 
 void ForwardErrorHandler(bool* called, const base::Closure& callback) {
   *called = true;
   callback.Run();
 }
 
 TEST_F(ConnectorTest, RaiseError) {
   base::RunLoop run_loop, run_loop2;
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
   bool error_handler_called0 = false;
   connector0.set_connection_error_handler(
       base::Bind(&ForwardErrorHandler, &error_handler_called0,
                  run_loop.QuitClosure()));
 
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
   bool error_handler_called1 = false;
   connector1.set_connection_error_handler(
       base::Bind(&ForwardErrorHandler, &error_handler_called1,
                  run_loop2.QuitClosure()));
 
   const char kText[] = "hello world";
 
   Message message;
   AllocMessage(kText, &message);
 
@@ skipping 25 matching lines @@
 
   // The error flag is set at both sides.
   EXPECT_TRUE(connector0.encountered_error());
   EXPECT_TRUE(connector1.encountered_error());
 
   // The message pipe handle is valid at both sides.
   EXPECT_TRUE(connector0.is_valid());
   EXPECT_TRUE(connector1.is_valid());
 }
 
-void PauseConnectorAndRunClosure(internal::Connector* connector,
+void PauseConnectorAndRunClosure(Connector* connector,
                                  const base::Closure& closure) {
   connector->PauseIncomingMethodCallProcessing();
   closure.Run();
 }
 
 TEST_F(ConnectorTest, PauseWithQueuedMessages) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   // Queue up two messages.
   Message message;
   AllocMessage(kText, &message);
   connector0.Accept(&message);
   AllocMessage(kText, &message);
   connector0.Accept(&message);
 
@@ skipping 16 matching lines @@
                               const base::Closure& closure) {
   base::RunLoop nested_run_loop;
   base::MessageLoop::ScopedNestableTaskAllower allow(
       base::MessageLoop::current());
   accumulator->set_closure(nested_run_loop.QuitClosure());
   nested_run_loop.Run();
   closure.Run();
 }
 
 TEST_F(ConnectorTest, ProcessWhenNested) {
-  internal::Connector connector0(std::move(handle0_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
-  internal::Connector connector1(std::move(handle1_),
-                                 internal::Connector::SINGLE_THREADED_SEND,
-                                 base::ThreadTaskRunnerHandle::Get());
+  Connector connector0(std::move(handle0_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
+  Connector connector1(std::move(handle1_), Connector::SINGLE_THREADED_SEND,
+                       base::ThreadTaskRunnerHandle::Get());
 
   const char kText[] = "hello world";
 
   // Queue up two messages.
   Message message;
   AllocMessage(kText, &message);
   connector0.Accept(&message);
   AllocMessage(kText, &message);
   connector0.Accept(&message);
 
   base::RunLoop run_loop;
   MessageAccumulator accumulator;
   // When the accumulator gets the first message it spins a nested message
   // loop. The loop is quit when another message is received.
   accumulator.set_closure(base::Bind(&AccumulateWithNestedLoop, &accumulator,
                                      run_loop.QuitClosure()));
   connector1.set_incoming_receiver(&accumulator);
 
   run_loop.Run();
 
   ASSERT_EQ(2u, accumulator.size());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo