Mojo: Expose untyped associated endpoints through public API

mojo/public/cpp/bindings/lib/associated_interface_ptr_state.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_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_
 
 #include <stdint.h>
 
 #include <algorithm>  // For |std::swap()|.
 #include <memory>
 #include <utility>
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/ref_counted.h"
 #include "base/single_thread_task_runner.h"
 #include "mojo/public/cpp/bindings/associated_group.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/lib/interface_endpoint_client.h"
 #include "mojo/public/cpp/bindings/lib/interface_id.h"
 #include "mojo/public/cpp/bindings/lib/multiplex_router.h"
-#include "mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h"
+#include "mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h"
 #include "mojo/public/cpp/system/message_pipe.h"
 
 namespace mojo {
 namespace internal {
 
 template <typename Interface>
 class AssociatedInterfacePtrState {
  public:
   AssociatedInterfacePtrState() : version_(0u) {}
 
@@ skipping 47 matching lines @@
 
   void Bind(AssociatedInterfacePtrInfo<Interface> info,
             scoped_refptr<base::SingleThreadTaskRunner> runner) {
     DCHECK(!endpoint_client_);
     DCHECK(!proxy_);
     DCHECK_EQ(0u, version_);
     DCHECK(info.is_valid());
 
     version_ = info.version();
     endpoint_client_.reset(new InterfaceEndpointClient(
-        AssociatedInterfacePtrInfoHelper::PassHandle(&info), nullptr,
+        info.PassHandle(), nullptr,
         base::WrapUnique(new typename Interface::ResponseValidator_()), false,
         std::move(runner)));
     proxy_.reset(new Proxy(endpoint_client_.get()));
     proxy_->serialization_context()->router = endpoint_client_->router();
   }
 
   // After this method is called, the object is in an invalid state and
   // shouldn't be reused.
   AssociatedInterfacePtrInfo<Interface> PassInterface() {
     ScopedInterfaceEndpointHandle handle = endpoint_client_->PassHandle();
     endpoint_client_.reset();
     proxy_.reset();
-
-    AssociatedInterfacePtrInfo<Interface> result;
-    result.set_version(version_);
-    AssociatedInterfacePtrInfoHelper::SetHandle(&result, std::move(handle));
-    return result;
+    return AssociatedInterfacePtrInfo<Interface>(std::move(handle), version_);
   }
 
   bool is_bound() const { return !!endpoint_client_; }
 
   bool encountered_error() const {
     return endpoint_client_ ? endpoint_client_->encountered_error() : false;
   }
 
   void set_connection_error_handler(const Closure& error_handler) {
     DCHECK(endpoint_client_);
@@ skipping 17 matching lines @@
 
   uint32_t version_;
 
   DISALLOW_COPY_AND_ASSIGN(AssociatedInterfacePtrState);
 };
 
 }  // namespace internal
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_ASSOCIATED_INTERFACE_PTR_STATE_H_