| Index: shell/child_process_host.cc
|
| diff --git a/mojo/shell/child_process_host.cc b/shell/child_process_host.cc
|
| similarity index 92%
|
| rename from mojo/shell/child_process_host.cc
|
| rename to shell/child_process_host.cc
|
| index 5d797586e7c817e314e678299d2baa6345e49822..9a68ec4f1b751ad9b20e7780a2ec895396d7a6b7 100644
|
| --- a/mojo/shell/child_process_host.cc
|
| +++ b/shell/child_process_host.cc
|
| @@ -2,7 +2,7 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "mojo/shell/child_process_host.h"
|
| +#include "shell/child_process_host.h"
|
|
|
| #include "base/base_switches.h"
|
| #include "base/bind.h"
|
| @@ -15,8 +15,8 @@
|
| #include "base/strings/string_number_conversions.h"
|
| #include "base/task_runner.h"
|
| #include "base/task_runner_util.h"
|
| -#include "mojo/shell/context.h"
|
| -#include "mojo/shell/switches.h"
|
| +#include "shell/context.h"
|
| +#include "shell/switches.h"
|
|
|
| namespace mojo {
|
| namespace shell {
|
| @@ -47,8 +47,7 @@ void ChildProcessHost::Start() {
|
| delegate_->WillStart();
|
|
|
| CHECK(base::PostTaskAndReplyWithResult(
|
| - context_->task_runners()->blocking_pool(),
|
| - FROM_HERE,
|
| + context_->task_runners()->blocking_pool(), FROM_HERE,
|
| base::Bind(&ChildProcessHost::DoLaunch, base::Unretained(this)),
|
| base::Bind(&ChildProcessHost::DidLaunch, base::Unretained(this))));
|
| }
|
| @@ -65,9 +64,7 @@ int ChildProcessHost::Join() {
|
|
|
| bool ChildProcessHost::DoLaunch() {
|
| static const char* kForwardSwitches[] = {
|
| - switches::kTraceToConsole,
|
| - switches::kV,
|
| - switches::kVModule,
|
| + switches::kTraceToConsole, switches::kV, switches::kVModule,
|
| };
|
|
|
| const base::CommandLine* parent_command_line =
|
|
|