Eliminate Quit() from Shell, and roll Shell & Connector together.

mojo/shell/runner/host/in_process_native_runner.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/in_process_native_runner.h"
 
 #include <utility>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
 #include "base/location.h"
+#include "base/strings/sys_string_conversions.h"
 #include "base/task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/platform_thread.h"
 #include "mojo/shell/runner/host/native_application_support.h"
 #include "mojo/shell/runner/host/out_of_process_native_runner.h"
 #include "mojo/shell/runner/init.h"
 
 namespace mojo {
 namespace shell {
 
@@ skipping 21 matching lines @@
 
   DCHECK(!request_.is_pending());
   request_ = std::move(request);
 
   DCHECK(app_completed_callback_runner_.is_null());
   app_completed_callback_runner_ = base::Bind(
       &base::TaskRunner::PostTask, base::ThreadTaskRunnerHandle::Get(),
       FROM_HERE, app_completed_callback);
 
   DCHECK(!thread_);
-  thread_.reset(new base::DelegateSimpleThread(this, "app_thread"));
+  std::string thread_name = base::SysWideToUTF8(app_path_.BaseName().value());
+  if (thread_name.empty())
+    thread_name = "mojo:app_thread";
+  thread_.reset(new base::DelegateSimpleThread(this, thread_name));
   thread_->Start();
   pid_available_callback.Run(base::kNullProcessId);
 }
 
 void InProcessNativeRunner::InitHost(
     ScopedHandle channel,
     InterfaceRequest<mojom::ShellClient> request) {
   NOTREACHED();  // Can't host another process in this runner.
 }
 
@@ skipping 20 matching lines @@
   // Non-Mojo apps are always run in a new process.
   if (!app_path.MatchesExtension(FILE_PATH_LITERAL(".mojo"))) {
     return make_scoped_ptr(
         new OutOfProcessNativeRunner(launch_process_runner_, nullptr));
   }
   return make_scoped_ptr(new InProcessNativeRunner);
 }
 
 }  // namespace shell
 }  // namespace mojo