Mojo: Expose untyped associated endpoints through public API

mojo/public/cpp/bindings/tests/associated_interface_unittest.cc

 // 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.
 
 #include <stddef.h>
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/threading/thread.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "mojo/public/cpp/bindings/associated_binding.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/binding.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
 #include "mojo/public/interfaces/bindings/tests/test_associated_interfaces.mojom.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace mojo {
 namespace test {
 namespace {
 
-using mojo::internal::AssociatedInterfacePtrInfoHelper;
-using mojo::internal::AssociatedInterfaceRequestHelper;
 using mojo::internal::MultiplexRouter;
-using mojo::internal::ScopedInterfaceEndpointHandle;
 
 class IntegerSenderImpl : public IntegerSender {
  public:
   explicit IntegerSenderImpl(AssociatedInterfaceRequest<IntegerSender> request)
       : binding_(this, std::move(request)) {}
 
   ~IntegerSenderImpl() override {}
 
   void set_notify_send_method_called(
       const base::Callback<void(int32_t)>& callback) {
@@ skipping 49 matching lines @@
  public:
   AssociatedInterfaceTest() {}
   ~AssociatedInterfaceTest() override { loop_.RunUntilIdle(); }
 
   void PumpMessages() { loop_.RunUntilIdle(); }
 
   template <typename T>
   AssociatedInterfacePtrInfo<T> EmulatePassingAssociatedPtrInfo(
       AssociatedInterfacePtrInfo<T> ptr_info,
       scoped_refptr<MultiplexRouter> target) {
-    ScopedInterfaceEndpointHandle handle =
-        AssociatedInterfacePtrInfoHelper::PassHandle(&ptr_info);
+    ScopedInterfaceEndpointHandle handle = ptr_info.PassHandle();
     CHECK(!handle.is_local());
-
-    ScopedInterfaceEndpointHandle new_handle =
-        target->CreateLocalEndpointHandle(handle.release());
-
-    AssociatedInterfacePtrInfo<T> result;
-    AssociatedInterfacePtrInfoHelper::SetHandle(&result, std::move(new_handle));
-    result.set_version(ptr_info.version());
-    return std::move(result);
+    return AssociatedInterfacePtrInfo<T>(
+        target->CreateLocalEndpointHandle(handle.release()),
+        ptr_info.version());
   }
 
   template <typename T>
   AssociatedInterfaceRequest<T> EmulatePassingAssociatedRequest(
       AssociatedInterfaceRequest<T> request,
       scoped_refptr<MultiplexRouter> target) {
-    ScopedInterfaceEndpointHandle handle =
-        AssociatedInterfaceRequestHelper::PassHandle(&request);
+    ScopedInterfaceEndpointHandle handle = request.PassHandle();
     CHECK(!handle.is_local());
-
-    ScopedInterfaceEndpointHandle new_handle =
-        target->CreateLocalEndpointHandle(handle.release());
-
-    AssociatedInterfaceRequest<T> result;
-    AssociatedInterfaceRequestHelper::SetHandle(&result, std::move(new_handle));
-    return std::move(result);
+    return MakeAssociatedRequest<T>(
+        target->CreateLocalEndpointHandle(handle.release()));
   }
 
   // Okay to call from any thread.
   void QuitRunLoop(base::RunLoop* run_loop) {
     if (loop_.task_runner()->BelongsToCurrentThread()) {
       run_loop->Quit();
     } else {
       loop_.PostTask(
           FROM_HERE,
           base::Bind(&AssociatedInterfaceTest::QuitRunLoop,
@@ skipping 433 matching lines @@
 
   // The previous wait has dispatched the GetSender request message, therefore
   // an associated interface has been set up on the pipe. It is not allowed to
   // wait or pause.
   EXPECT_TRUE(connection.binding()->HasAssociatedInterfaces());
 }
 
 }  // namespace
 }  // namespace test
 }  // namespace mojo