Mojo: Expose untyped associated endpoints through public API

mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h

Index: mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
diff --git a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
similarity index 62%
rename from mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h
rename to mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
index cb9418120716447f01435b046eeff94c107ccbab..d13676470f0ce9d960e24909c00b1b3473798b86 100644
--- a/mojo/public/cpp/bindings/lib/scoped_interface_endpoint_handle.h
+++ b/mojo/public/cpp/bindings/scoped_interface_endpoint_handle.h
@@ -2,8 +2,8 @@
 // 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_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
-#define MOJO_PUBLIC_CPP_BINDINGS_LIB_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
@@ -11,9 +11,10 @@
 #include "mojo/public/cpp/bindings/lib/interface_id.h"
 
 namespace mojo {
-namespace internal {
 
+namespace internal {
 class MultiplexRouter;
+}
 
 // ScopedInterfaceEndpointHandle refers to one end of an interface, either the
 // implementation side or the client side.
@@ -24,14 +25,6 @@ class ScopedInterfaceEndpointHandle {
   // Creates an invalid endpoint handle.
   ScopedInterfaceEndpointHandle();
 
-  // This is supposed to be used by MultiplexRouter only.
-  // |id| is the corresponding interface ID.
-  // If |is_local| is false, this handle is meant to be passed over |router| to
-  // the remote side.
-  ScopedInterfaceEndpointHandle(InterfaceId id,
-                                bool is_local,
-                                scoped_refptr<MultiplexRouter> router);
-
   ScopedInterfaceEndpointHandle(ScopedInterfaceEndpointHandle&& other);
 
   ~ScopedInterfaceEndpointHandle();
@@ -39,25 +32,39 @@ class ScopedInterfaceEndpointHandle {
   ScopedInterfaceEndpointHandle& operator=(
       ScopedInterfaceEndpointHandle&& other);
 
-  bool is_valid() const { return IsValidInterfaceId(id_); }
+  bool is_valid() const { return internal::IsValidInterfaceId(id_); }
 
-  InterfaceId id() const { return id_; }
   bool is_local() const { return is_local_; }
-  MultiplexRouter* router() const { return router_.get(); }
 
   void reset();
   void swap(ScopedInterfaceEndpointHandle& other);
 
+  // DO NOT USE METHODS BELOW THIS LINE. These are for internal use and testing.
+
+  internal::InterfaceId id() const { return id_; }
+
+  internal::MultiplexRouter* router() const { return router_.get(); }
+
   // Releases the handle without closing it.
-  InterfaceId release();
+  internal::InterfaceId release();
 
  private:
-  InterfaceId id_;
+  friend class internal::MultiplexRouter;
+
+  // This is supposed to be used by MultiplexRouter only.
+  // |id| is the corresponding interface ID.
+  // If |is_local| is false, this handle is meant to be passed over |router| to
+  // the remote side.
+  ScopedInterfaceEndpointHandle(
+      internal::InterfaceId id,
+      bool is_local,
+      scoped_refptr<internal::MultiplexRouter> router);
+
+  internal::InterfaceId id_;
   bool is_local_;
-  scoped_refptr<MultiplexRouter> router_;
+  scoped_refptr<internal::MultiplexRouter> router_;
 };
 
-}  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_SCOPED_INTERFACE_ENDPOINT_HANDLE_H_