Flatten interface_binder.h and callback_binder.h

services/service_manager/public/cpp/interface_binder.cc

Index: services/service_manager/public/cpp/interface_binder.cc
diff --git a/services/service_manager/public/cpp/lib/callback_binder.cc b/services/service_manager/public/cpp/interface_binder.cc
similarity index 85%
rename from services/service_manager/public/cpp/lib/callback_binder.cc
rename to services/service_manager/public/cpp/interface_binder.cc
index d761c04d3c803b768558fb4e3ba2140d2340b0c8..48a6cd98f10d618130cc77c4377b49bf47a76f1c 100644
--- a/services/service_manager/public/cpp/lib/callback_binder.cc
+++ b/services/service_manager/public/cpp/interface_binder.cc
@@ -1,11 +1,10 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
+// Copyright 2017 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/lib/callback_binder.h"
+#include "services/service_manager/public/cpp/interface_binder.h"
 
 namespace service_manager {
-namespace internal {
 
 GenericCallbackBinder::GenericCallbackBinder(
     const BindCallback& callback,
@@ -33,5 +32,4 @@ void GenericCallbackBinder::RunCallback(const BindCallback& callback,
   callback.Run(std::move(handle));
 }
 
-}  // namespace internal
 }  // namespace service_manager