Flatten interface_binder.h and callback_binder.h

services/service_manager/public/cpp/lib/binder_registry.cc

 // 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.
 
 #include "services/service_manager/public/cpp/binder_registry.h"
 
 #include "services/service_manager/public/cpp/identity.h"
 
 namespace service_manager {
 
 BinderRegistry::BinderRegistry() : weak_factory_(this) {}
 BinderRegistry::~BinderRegistry() {}
 
 void BinderRegistry::AddInterface(
     const std::string& interface_name,
     const base::Callback<void(mojo::ScopedMessagePipeHandle)>& callback,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner) {
-  SetInterfaceBinder(
-      interface_name,
-      base::MakeUnique<internal::GenericCallbackBinder>(callback, task_runner));
+  SetInterfaceBinder(interface_name, base::MakeUnique<GenericCallbackBinder>(
+                                         callback, task_runner));
 }
 
 void BinderRegistry::RemoveInterface(const std::string& interface_name) {
   auto it = binders_.find(interface_name);
   if (it != binders_.end())
     binders_.erase(it);
 }
 
 bool BinderRegistry::CanBindInterface(const std::string& interface_name) const {
   auto it = binders_.find(interface_name);
@@ skipping 18 matching lines @@
 }
 
 void BinderRegistry::SetInterfaceBinder(
     const std::string& interface_name,
     std::unique_ptr<InterfaceBinder> binder) {
   RemoveInterface(interface_name);
   binders_[interface_name] = std::move(binder);
 }
 
 }  // namespace service_manager