Flatten interface_binder.h and callback_binder.h

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

Index: services/service_manager/public/cpp/lib/binder_registry.cc
diff --git a/services/service_manager/public/cpp/lib/binder_registry.cc b/services/service_manager/public/cpp/lib/binder_registry.cc
index 91fd1130931cc8d98761b4b22dd1d002a74ca05c..d45591626694b4833eda0bb15edea48c8a051b34 100644
--- a/services/service_manager/public/cpp/lib/binder_registry.cc
+++ b/services/service_manager/public/cpp/lib/binder_registry.cc
@@ -15,9 +15,8 @@ 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) {