Move shell interfaces into the shell.mojom namespace.

mojo/shell/runner/host/child_process_host.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/runner/host/child_process_host.h"
 
 #include <stdint.h>
 
 #include <utility>
 
@@ skipping 70 matching lines @@
 }
 
 ChildProcessHost::ChildProcessHost(ScopedHandle channel)
     : launch_process_runner_(nullptr),
       start_sandboxed_(false),
       channel_info_(nullptr),
       start_child_process_event_(false, false),
       weak_factory_(this) {
   CHECK(channel.is_valid());
   ScopedMessagePipeHandle handle(MessagePipeHandle(channel.release().value()));
-  controller_.Bind(InterfacePtrInfo<ChildController>(std::move(handle), 0u));
+  controller_.Bind(
+      InterfacePtrInfo<mojom::ChildController>(std::move(handle), 0u));
 }
 
 ChildProcessHost::~ChildProcessHost() {
   if (!app_path_.empty())
     CHECK(!controller_) << "Destroying ChildProcessHost before calling Join";
 }
 
 void ChildProcessHost::Start(const ProcessReadyCallback& callback) {
   DCHECK(!child_process_.IsValid());
   DCHECK(process_ready_callback_.is_null());
@@ skipping 29 matching lines @@
   launch_process_runner_->PostTaskAndReply(
       FROM_HERE,
       base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this)),
       base::Bind(&ChildProcessHost::DidStart, weak_factory_.GetWeakPtr()));
 }
 
 int ChildProcessHost::Join() {
   if (controller_)  // We use this as a signal that Start was called.
     start_child_process_event_.Wait();
 
-  controller_ = ChildControllerPtr();
+  controller_ = mojom::ChildControllerPtr();
   DCHECK(child_process_.IsValid());
 
   // Ensure the child pipe is closed even if it wasn't yet connected to the
   // controller.
   pipe_holder_->Reject();
 
   int rv = -1;
   LOG_IF(ERROR, !child_process_.WaitForExit(&rv))
       << "Failed to wait for child process";
 
   child_process_.Close();
 
   return rv;
 }
 
 void ChildProcessHost::StartApp(
-    InterfaceRequest<Application> application_request,
-    const ChildController::StartAppCallback& on_app_complete) {
+    InterfaceRequest<mojom::Application> application_request,
+    const mojom::ChildController::StartAppCallback& on_app_complete) {
   DCHECK(controller_);
 
   on_app_complete_ = on_app_complete;
   controller_->StartApp(
       std::move(application_request),
       base::Bind(&ChildProcessHost::AppCompleted, weak_factory_.GetWeakPtr()));
 }
 
 void ChildProcessHost::ExitNow(int32_t exit_code) {
   DCHECK(controller_);
@@ skipping 110 matching lines @@
 void ChildProcessHost::DidCreateChannel(embedder::ChannelInfo* channel_info) {
   DVLOG(2) << "AppChildProcessHost::DidCreateChannel()";
 
   DCHECK(channel_info ||
          base::CommandLine::ForCurrentProcess()->HasSwitch("use-new-edk"));
   channel_info_ = channel_info;
 }
 
 void ChildProcessHost::OnMessagePipeCreated() {
   controller_.Bind(
-      InterfacePtrInfo<ChildController>(pipe_holder_->PassPipe(), 0u));
+      InterfacePtrInfo<mojom::ChildController>(pipe_holder_->PassPipe(), 0u));
   MaybeNotifyProcessReady();
 }
 
 void ChildProcessHost::MaybeNotifyProcessReady() {
   if (controller_.is_bound() && child_process_.IsValid())
     process_ready_callback_.Run(child_process_.Pid());
 }
 
 // static
 void ChildProcessHost::OnParentMessagePipeCreated(
     scoped_refptr<PipeHolder> holder,
     scoped_refptr<base::TaskRunner> callback_task_runner,
     const base::Closure& callback,
     ScopedMessagePipeHandle pipe) {
   holder->SetPipe(std::move(pipe));
   callback_task_runner->PostTask(FROM_HERE, callback);
 }
 
 }  // namespace shell
 }  // namespace mojo