Mojo C++ Bindings: Extract AssociatedGroupController from MultiplexRouter

mojo/public/cpp/bindings/interface_id.h

Index: mojo/public/cpp/bindings/interface_id.h
diff --git a/mojo/public/cpp/bindings/lib/interface_id.h b/mojo/public/cpp/bindings/interface_id.h
similarity index 83%
rename from mojo/public/cpp/bindings/lib/interface_id.h
rename to mojo/public/cpp/bindings/interface_id.h
index 9baeedf358718fb1e4a5c0796c7ff480a2effda3..53475d6f789ff7eeb4170dde4dfb1cf1bbb7c6ef 100644
--- a/mojo/public/cpp/bindings/lib/interface_id.h
+++ b/mojo/public/cpp/bindings/interface_id.h
@@ -2,13 +2,12 @@
 // 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_INTERFACE_ID_H_
-#define MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_ID_H_
+#ifndef MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_ID_H_
+#define MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_ID_H_
 
 #include <stdint.h>
 
 namespace mojo {
-namespace internal {
 
 // The size of the type matters because it is directly used in messages.
 using InterfaceId = uint32_t;
@@ -31,7 +30,6 @@ inline bool IsValidInterfaceId(InterfaceId id) {
   return id != kInvalidInterfaceId;
 }
 
-}  // namespace internal
 }  // namespace mojo
 
-#endif  // MOJO_PUBLIC_CPP_BINDINGS_LIB_INTERFACE_ID_H_
+#endif  // MOJO_PUBLIC_CPP_BINDINGS_INTERFACE_ID_H_