Flatten interface_binder.h and callback_binder.h

services/service_manager/public/cpp/binder_registry.h

 // Copyright 2016 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 SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BINDER_REGISTRY_H_
 #define SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BINDER_REGISTRY_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "mojo/public/cpp/system/message_pipe.h"
-#include "services/service_manager/public/cpp/lib/callback_binder.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
 
 namespace service_manager {
 
 class InterfaceBinder;
 struct BindSourceInfo;
 
 class BinderRegistry {
  public:
   using Binder = base::Callback<void(const std::string&,
                                 mojo::ScopedMessagePipeHandle)>;
 
   BinderRegistry();
   ~BinderRegistry();
 
   template <typename Interface>
   void AddInterface(
       const base::Callback<void(const BindSourceInfo&,
                                 mojo::InterfaceRequest<Interface>)>& callback,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner =
           nullptr) {
-    SetInterfaceBinder(Interface::Name_,
-                       base::MakeUnique<internal::CallbackBinder<Interface>>(
-                           callback, task_runner));
+    SetInterfaceBinder(
+        Interface::Name_,
+        base::MakeUnique<CallbackBinder<Interface>>(callback, task_runner));
   }
   void AddInterface(
       const std::string& interface_name,
       const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback,
       const scoped_refptr<base::SingleThreadTaskRunner>& task_runner = nullptr);
 
   // Removes the specified interface from the registry. This has no effect on
   // bindings already completed.
   template <typename Interface>
   void RemoveInterface() {
@@ skipping 24 matching lines @@
 
   base::WeakPtrFactory<BinderRegistry> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BinderRegistry);
 };
 
 
 }  // namespace service_manager
 
 #endif  // SERVICES_SERVICE_MANAGER_PUBLIC_CPP_BINDER_REGISTRY_H_