Move channel_init out of mojo_common.

mojo/dbus/dbus_external_service.h

 // 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 "base/memory/scoped_ptr.h"
 #include "dbus/bus.h"
 #include "dbus/exported_object.h"
 #include "dbus/message.h"
 #include "dbus/object_path.h"
-#include "mojo/common/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/public/cpp/application/application.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 #include "mojo/shell/external_service.mojom.h"
 
 namespace mojo {
 const char kMojoDBusImplPath[] = "/org/chromium/MojoImpl";
 const char kMojoDBusInterface[] = "org.chromium.Mojo";
 const char kMojoDBusConnectMethod[] = "ConnectChannel";
 
 class DBusExternalServiceBase {
@@ skipping 15 matching lines @@
   void ConnectChannel(dbus::MethodCall* method_call,
                       dbus::ExportedObject::ResponseSender sender);
 
   void ExportMethods();
   void InitializeDBus();
   void TakeDBusServiceOwnership();
 
   const std::string service_name_;
   scoped_refptr<dbus::Bus> bus_;
   dbus::ExportedObject* exported_object_;  // Owned by bus_;
-  scoped_ptr<common::ChannelInit> channel_init_;
+  scoped_ptr<embedder::ChannelInit> channel_init_;
   DISALLOW_COPY_AND_ASSIGN(DBusExternalServiceBase);
 };
 
 template <class ServiceImpl>
 class DBusExternalService : public DBusExternalServiceBase {
  public:
   explicit DBusExternalService(const std::string& service_name)
       : DBusExternalServiceBase(service_name) {
   }
   virtual ~DBusExternalService() {}
@@ skipping 22 matching lines @@
     }
    private:
     DBusExternalService* service_;
     scoped_ptr<Application> app_;
   };
 
   scoped_ptr<Impl> external_service_;
 };
 
 }  // namespace mojo