Flatten interface_binder.h and callback_binder.h

services/service_manager/public/cpp/BUILD.gn

 # 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.
 
 group("cpp") {
   public_deps = [
     ":sources",
   ]
 }
 
 # TODO(rockot): Rename this to "cpp".
 static_library("sources") {
   sources = [
     "bind_source_info.h",
     "binder_registry.h",
     "connect.h",
     "connector.cc",
     "connector.h",
     "identity.h",
+    "interface_binder.cc",
     "interface_binder.h",
     "interface_provider.h",
     "interface_provider_spec.h",
     "lib/bind_source_info.cc",
     "lib/binder_registry.cc",
-    "lib/callback_binder.cc",
-    "lib/callback_binder.h",
     "lib/identity.cc",
     "lib/interface_provider.cc",
     "lib/interface_provider_spec.cc",
     "lib/service.cc",
     "lib/service_context.cc",
     "lib/service_context_ref.cc",
     "lib/service_runner.cc",
     "service.h",
     "service_context.h",
     "service_context_ref.h",
@@ skipping 28 matching lines @@
       "//mojo/edk/system",
       "//mojo/public/cpp/bindings",
       "//mojo/public/cpp/system",
       "//services/service_manager/background:lib",
       "//services/service_manager/public/interfaces",
     ]
 
     data_deps = []
   }
 }