Rename shell.mojom to connector.mojom, ApplicationManager to Shell

content/browser/mojo/mojo_shell_context.cc

 // Copyright 2015 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 "content/browser/mojo/mojo_shell_context.h"
 
 #include <utility>
 
 #include "base/lazy_instance.h"
 #include "base/macros.h"
@@ skipping 12 matching lines @@
 #include "content/public/browser/utility_process_host_client.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/service_registry.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/shell/connect_params.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/loader.h"
 #include "mojo/shell/native_runner.h"
 #include "mojo/shell/public/cpp/shell_client.h"
-#include "mojo/shell/public/interfaces/shell.mojom.h"
+#include "mojo/shell/public/interfaces/connector.mojom.h"
 #include "mojo/shell/runner/host/in_process_native_runner.h"
 
 namespace content {
 
 namespace {
 
 const char kBrowserAppName[] = "exe:chrome";
 
 // An extra set of apps to register on initialization, if set by a test.
 const MojoShellContext::StaticApplicationMap* g_applications_for_test;
@@ skipping 154 matching lines @@
 }
 
 MojoShellContext::MojoShellContext() {
   proxy_.Get().reset(new Proxy(this));
 
   scoped_refptr<base::SingleThreadTaskRunner> file_task_runner =
       BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE);
   scoped_ptr<mojo::shell::NativeRunnerFactory> native_runner_factory(
       new mojo::shell::InProcessNativeRunnerFactory(
           BrowserThread::GetBlockingPool()));
-  application_manager_.reset(new mojo::shell::ApplicationManager(
-      std::move(native_runner_factory), file_task_runner.get(), nullptr));
+  shell_.reset(new mojo::shell::Shell(std::move(native_runner_factory),
+                                      file_task_runner.get(), nullptr));
 
-  application_manager_->set_default_loader(
+  shell_->set_default_loader(
       scoped_ptr<mojo::shell::Loader>(new DefaultLoader));
 
   StaticApplicationMap apps;
   GetContentClient()->browser()->RegisterInProcessMojoApplications(&apps);
   if (g_applications_for_test) {
     // Add testing apps to the map, potentially overwriting whatever the
     // browser client registered.
     for (const auto& entry : *g_applications_for_test)
       apps[entry.first] = entry.second;
   }
   for (const auto& entry : apps) {
-    application_manager_->SetLoaderForName(
+    shell_->SetLoaderForName(
         make_scoped_ptr(new StaticLoader(entry.second)), entry.first);
   }
 
   ContentBrowserClient::OutOfProcessMojoApplicationMap sandboxed_apps;
   GetContentClient()
       ->browser()
       ->RegisterOutOfProcessMojoApplications(&sandboxed_apps);
   for (const auto& app : sandboxed_apps) {
-    application_manager_->SetLoaderForName(
+    shell_->SetLoaderForName(
         make_scoped_ptr(
             new UtilityProcessLoader(app.second, true /* use_sandbox */)),
         app.first);
   }
 
   ContentBrowserClient::OutOfProcessMojoApplicationMap unsandboxed_apps;
   GetContentClient()
       ->browser()
       ->RegisterUnsandboxedOutOfProcessMojoApplications(&unsandboxed_apps);
   for (const auto& app : unsandboxed_apps) {
-    application_manager_->SetLoaderForName(
+    shell_->SetLoaderForName(
         make_scoped_ptr(
             new UtilityProcessLoader(app.second, false /* use_sandbox */)),
         app.first);
   }
 
 #if (ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
-  application_manager_->SetLoaderForName(make_scoped_ptr(new GpuProcessLoader),
-                                         "mojo:media");
+  shell_->SetLoaderForName(make_scoped_ptr(new GpuProcessLoader), "mojo:media");
 #endif
 
   base::Callback<scoped_ptr<mojo::ShellClient>()> profile_callback =
       base::Bind(&profile::CreateProfileApp);
-  application_manager_->SetLoaderForName(
+  shell_->SetLoaderForName(
       make_scoped_ptr(new StaticLoader(profile_callback)), "mojo:profile");
 
   if (!IsRunningInMojoShell()) {
     MojoShellConnectionImpl::Create(
-        application_manager_->InitInstanceForEmbedder(kBrowserAppName));
+        shell_->InitInstanceForEmbedder(kBrowserAppName));
   }
 }
 
 MojoShellContext::~MojoShellContext() {
   if (!IsRunningInMojoShell())
     MojoShellConnectionImpl::Destroy();
 }
 
 // static
 void MojoShellContext::ConnectToApplication(
@@ skipping 19 matching lines @@
   //             manager doesn't understand.
   mojo::shell::Identity source_id(
       requestor_name, std::string(), mojo::shell::mojom::Connector::kUserRoot);
   source_id.set_filter(mojo::shell::GetPermissiveCapabilityFilter());
   params->set_source(source_id);
   params->set_target(mojo::shell::Identity(
       name, std::string(), mojo::shell::mojom::Connector::kUserRoot));
   params->set_remote_interfaces(std::move(request));
   params->set_local_interfaces(std::move(exposed_services));
   params->set_connect_callback(callback);
-  application_manager_->Connect(std::move(params));
+  shell_->Connect(std::move(params));
 }
 
 }  // namespace content