Move channel_init out of mojo_common.

mojo/shell/dbus_service_loader_linux.cc

 // 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.
 
 #include "mojo/shell/dbus_service_loader_linux.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/task_runner_util.h"
 #include "base/threading/thread_restrictions.h"
 #include "dbus/bus.h"
 #include "dbus/file_descriptor.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
 #include "dbus/object_proxy.h"
-#include "mojo/common/channel_init.h"
 #include "mojo/dbus/dbus_external_service.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/embedder/platform_channel_pair.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/external_service.mojom.h"
 #include "mojo/shell/keep_alive.h"
 
 namespace mojo {
 namespace shell {
 
 // Manages the connection to a single externally-running service.
 class DBusServiceLoader::LoadContext {
@@ skipping 26 matching lines @@
  private:
   // Sets up a pipe to share with the externally-running service and returns
   // the endpoint that should be sent over DBus.
   // The FD for the endpoint must be validated on an IO thread.
   scoped_ptr<dbus::FileDescriptor> CreateChannelOnIOThread() {
     base::ThreadRestrictions::AssertIOAllowed();
     CHECK(bus_->Connect());
     CHECK(bus_->SetUpAsyncOperations());
 
     embedder::PlatformChannelPair channel_pair;
-    channel_init_.reset(new common::ChannelInit);
+    channel_init_.reset(new embedder::ChannelInit);
     mojo::ScopedMessagePipeHandle bootstrap_message_pipe =
         channel_init_->Init(channel_pair.PassServerHandle().release().fd,
                             loader_->context_->task_runners()->io_runner());
     CHECK(bootstrap_message_pipe.is_valid());
 
     external_service_.Bind(bootstrap_message_pipe.Pass());
 
     scoped_ptr<dbus::FileDescriptor> client_fd(new dbus::FileDescriptor);
     client_fd->PutValue(channel_pair.PassClientHandle().release().fd);
     client_fd->CheckValidity();  // Must be run on an IO thread.
@@ skipping 48 matching lines @@
                      base::Unretained(loader_), url_));
     }
   }
 
   DBusServiceLoader* const loader_;
   scoped_refptr<dbus::Bus> bus_;
   dbus::ObjectProxy* service_dbus_proxy_;  // Owned by bus_;
   const GURL url_;
   ScopedMessagePipeHandle service_provider_handle_;
   KeepAlive keep_alive_;
-  scoped_ptr<common::ChannelInit> channel_init_;
+  scoped_ptr<embedder::ChannelInit> channel_init_;
   ExternalServicePtr external_service_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadContext);
 };
 
 DBusServiceLoader::DBusServiceLoader(Context* context) : context_(context) {
   dbus::Bus::Options options;
   options.bus_type = dbus::Bus::SESSION;
   options.dbus_task_runner = context_->task_runners()->io_runner();
   bus_ = new dbus::Bus(options);
@@ skipping 25 matching lines @@
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo