Rename mash_shell to mash_session.

chrome/app/mash/mash_runner.cc

 // Copyright 2016 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 "chrome/app/mash/mash_runner.h"
 
 #include "ash/mus/sysui_application.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
 #include "base/i18n/icu_util.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/launch.h"
 #include "components/mus/mus_app.h"
 #include "components/resource_provider/resource_provider_app.h"
 #include "content/public/common/content_switches.h"
 #include "mash/quick_launch/quick_launch_application.h"
-#include "mash/shell/shell_application_delegate.h"
+#include "mash/session/session.h"
 #include "mash/wm/window_manager_application.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/native_runner_delegate.h"
 #include "mojo/shell/public/cpp/connector.h"
 #include "mojo/shell/public/cpp/identity.h"
 #include "mojo/shell/public/cpp/shell_client.h"
 #include "mojo/shell/public/cpp/shell_connection.h"
 #include "mojo/shell/public/interfaces/shell_client_factory.mojom.h"
 #include "mojo/shell/runner/common/switches.h"
@@ skipping 47 matching lines @@
     NOTREACHED();
   }
 
  private:
   // TODO(sky): move this into mash.
   scoped_ptr<mojo::ShellClient> CreateShellClient(const std::string& name) {
     if (name == "mojo:ash_sysui")
       return make_scoped_ptr(new ash::sysui::SysUIApplication);
     if (name == "mojo:desktop_wm")
       return make_scoped_ptr(new mash::wm::WindowManagerApplication);
-    if (name == "mojo:mash_shell")
-      return make_scoped_ptr(new mash::shell::ShellApplicationDelegate);
+    if (name == "mojo:mash_session")
+      return make_scoped_ptr(new mash::session::Session);
     if (name == "mojo:mus")
       return make_scoped_ptr(new mus::MandolineUIServicesApp);
     if (name == "mojo:quick_launch")
       return make_scoped_ptr(new mash::quick_launch::QuickLaunchApplication);
     if (name == "mojo:resource_provider") {
       return make_scoped_ptr(
           new resource_provider::ResourceProviderApp("mojo:resource_provider"));
     }
 #if defined(OS_LINUX)
     if (name == "mojo:font_service")
@@ skipping 80 matching lines @@
   NativeRunnerDelegateImpl native_runner_delegate;
   mojo::shell::BackgroundShell background_shell;
   scoped_ptr<mojo::shell::BackgroundShell::InitParams> init_params(
       new mojo::shell::BackgroundShell::InitParams);
   init_params->native_runner_delegate = &native_runner_delegate;
   background_shell.Init(std::move(init_params));
   shell_client_.reset(new DefaultShellClient);
   shell_connection_.reset(new mojo::ShellConnection(
       shell_client_.get(),
       background_shell.CreateShellClientRequest("exe:chrome_mash")));
-  shell_connection_->connector()->Connect("mojo:mash_shell");
+  shell_connection_->connector()->Connect("mojo:mash_session");
   base::MessageLoop::current()->Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
   mojo::shell::ChildProcessMain(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
 
 void MashRunner::StartChildApp(
@@ skipping 24 matching lines @@
   scoped_ptr<base::MessageLoop> message_loop;
 #if defined(OS_LINUX)
   base::AtExitManager exit_manager;
 #endif
   if (!IsChild())
     message_loop.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
   MashRunner mash_runner;
   mash_runner.Run();
   return 0;
 }