Move channel_init out of mojo_common.

content/browser/mojo/mojo_application_host.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.
 
 #ifndef CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 #define CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_
 
 #include "base/process/process_handle.h"
-#include "mojo/common/channel_init.h"
+#include "mojo/embedder/channel_init.h"
 #include "mojo/embedder/scoped_platform_handle.h"
 #include "mojo/public/interfaces/service_provider/service_provider.mojom.h"
 
 namespace IPC {
 class Sender;
 }
 
 namespace content {
 
 // MojoApplicationHost represents the code needed on the browser side to setup
@@ skipping 28 matching lines @@
     }
 
     // mojo::ServiceProvider methods:
     virtual void ConnectToService(
         const mojo::String& service_url,
         const mojo::String& service_name,
         mojo::ScopedMessagePipeHandle handle,
         const mojo::String& requestor_url) OVERRIDE;
   };
 
-  mojo::common::ChannelInit channel_init_;
+  mojo::embedder::ChannelInit channel_init_;
   mojo::embedder::ScopedPlatformHandle client_handle_;
 
   scoped_ptr<ServiceProviderImpl> child_service_provider_;
 
   bool did_activate_;
 
   DISALLOW_COPY_AND_ASSIGN(MojoApplicationHost);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_MOJO_MOJO_APPLICATION_HOST_H_