Mojo C++ bindings: Move MakeProxy() -> InterfacePtr::Create().

mojo/public/cpp/bindings/interface_ptr.h

 // Copyright 2014 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_INTERFACE_PTR_H_
 #define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_
 
 #include <algorithm>
 #include <cstddef>
 
@@ skipping 39 matching lines @@
   // Assigning nullptr to this class causes it to close the currently bound
   // message pipe (if any) and returns the pointer to the unbound state.
   InterfacePtr& operator=(std::nullptr_t) {
     reset();
     return *this;
   }
 
   // Closes the bound message pipe (if any) on destruction.
   ~InterfacePtr() {}
 
+  // If |info| is valid (containing a valid message pipe handle), returns an
+  // InterfacePtr bound to it. Otherwise, returns an unbound InterfacePtr. The
+  // specified |waiter| will be used as in the InterfacePtr::Bind() method.
+  static InterfacePtr<Interface> Create(
+      InterfaceHandle<Interface> info,
+      const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter()) {
+    InterfacePtr<Interface> ptr;
+    if (info.is_valid())
+      ptr.Bind(info.Pass(), waiter);
+    return ptr;
+  }
+
   // Binds the InterfacePtr to a remote implementation of Interface. The
   // |waiter| is used for receiving notifications when there is data to read
   // from the message pipe. For most callers, the default |waiter| will be
   // sufficient.
   //
   // Calling with an invalid |info| (containing an invalid message pipe handle)
   // has the same effect as reset(). In this case, the InterfacePtr is not
   // considered as bound.
   void Bind(
       InterfaceHandle<Interface> info,
@@ skipping 95 matching lines @@
     return &internal_state_;
   }
 
  private:
   typedef internal::InterfacePtrState<Interface> State;
   mutable State internal_state_;
 
   MOJO_MOVE_ONLY_TYPE(InterfacePtr);
 };
 
-// If |info| is valid (containing a valid message pipe handle), returns an
-// InterfacePtr bound to it. Otherwise, returns an unbound InterfacePtr. The
-// specified |waiter| will be used as in the InterfacePtr::Bind() method.
-template <typename Interface>
-InterfacePtr<Interface> MakeProxy(
-    InterfaceHandle<Interface> info,
-    const MojoAsyncWaiter* waiter = Environment::GetDefaultAsyncWaiter()) {
-  InterfacePtr<Interface> ptr;
-  if (info.is_valid())
-    ptr.Bind(info.Pass(), waiter);
-  return ptr;
-}
-
 }  // namespace mojo
 
 #endif  // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_PTR_H_