Flatten interface_binder.h and callback_binder.h

services/service_manager/public/cpp/interface_binder.cc

-// 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,
     const scoped_refptr<base::SingleThreadTaskRunner>& task_runner)
     : callback_(callback), task_runner_(task_runner) {}
 
 GenericCallbackBinder::~GenericCallbackBinder() {}
 
 void GenericCallbackBinder::BindInterface(
     const BindSourceInfo& source_info,
     const std::string& interface_name,
     mojo::ScopedMessagePipeHandle handle) {
   if (task_runner_) {
     task_runner_->PostTask(
         FROM_HERE, base::Bind(&GenericCallbackBinder::RunCallback, callback_,
                               base::Passed(&handle)));
     return;
   }
   RunCallback(callback_, std::move(handle));
 }
 
 // static
 void GenericCallbackBinder::RunCallback(const BindCallback& callback,
                                         mojo::ScopedMessagePipeHandle handle) {
   callback.Run(std::move(handle));
 }
 
-}  // namespace internal
 }  // namespace service_manager