Change Mojo URLs to structured names

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/wm/window_manager_application.h"
-#include "mojo/common/mojo_scheme_register.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
 #include "mojo/shell/background/background_shell.h"
 #include "mojo/shell/identity.h"
 #include "mojo/shell/native_runner_delegate.h"
 #include "mojo/shell/public/cpp/connector.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"
 #include "mojo/shell/runner/host/child_process_base.h"
-#include "url/gurl.h"
-#include "url/url_util.h"
 
 #if defined(OS_LINUX)
 #include "components/font_service/font_service_app.h"
 #endif
 
 using mojo::shell::mojom::ShellClientFactory;
 
 namespace {
 
 // kProcessType used to identify child processes.
@@ skipping 14 matching lines @@
   }
 
   // mojo::InterfaceFactory<ShellClientFactory>
   void Create(mojo::Connection* connection,
               mojo::InterfaceRequest<ShellClientFactory> request) override {
     shell_client_factory_bindings_.AddBinding(this, std::move(request));
   }
 
   // ShellClientFactory:
   void CreateShellClient(mojo::shell::mojom::ShellClientRequest request,
-                         const mojo::String& mojo_url) override {
-    const GURL url = GURL(std::string(mojo_url));
+                         const mojo::String& mojo_name) override {
     if (shell_client_) {
-      LOG(ERROR) << "request to create additional app " << url;
+      LOG(ERROR) << "request to create additional app " << mojo_name;
       return;
     }
-    shell_client_ = CreateShellClient(url);
+    shell_client_ = CreateShellClient(mojo_name);
     if (shell_client_) {
       shell_connection_.reset(
           new mojo::ShellConnection(shell_client_.get(), std::move(request)));
       return;
     }
-    LOG(ERROR) << "unknown url " << url;
+    LOG(ERROR) << "unknown name " << mojo_name;
     NOTREACHED();
   }
 
  private:
   // TODO(sky): move this into mash.
-  scoped_ptr<mojo::ShellClient> CreateShellClient(const GURL& url) {
-    if (url == GURL("mojo:ash_sysui"))
+  scoped_ptr<mojo::ShellClient> CreateShellClient(const std::string& name) {
+    if (name == "mojo:ash_sysui")
       return make_scoped_ptr(new ash::sysui::SysUIApplication);
-    if (url == GURL("mojo:desktop_wm"))
+    if (name == "mojo:desktop_wm")
       return make_scoped_ptr(new mash::wm::WindowManagerApplication);
-    if (url == GURL("mojo:mash_shell"))
+    if (name == "mojo:mash_shell")
       return make_scoped_ptr(new mash::shell::ShellApplicationDelegate);
-    if (url == GURL("mojo:mus"))
+    if (name == "mojo:mus")
       return make_scoped_ptr(new mus::MandolineUIServicesApp);
-    if (url == GURL("mojo:quick_launch"))
+    if (name == "mojo:quick_launch")
       return make_scoped_ptr(new mash::quick_launch::QuickLaunchApplication);
-    if (url == GURL("mojo:resource_provider")) {
+    if (name == "mojo:resource_provider") {
       return make_scoped_ptr(
           new resource_provider::ResourceProviderApp("mojo:resource_provider"));
     }
 #if defined(OS_LINUX)
-    if (url == GURL("mojo:font_service"))
+    if (name == "mojo:font_service")
       return make_scoped_ptr(new font_service::FontServiceApp);
 #endif
     return nullptr;
   }
 
   mojo::BindingSet<ShellClientFactory> shell_client_factory_bindings_;
   scoped_ptr<mojo::ShellClient> shell_client_;
   scoped_ptr<mojo::ShellConnection> shell_connection_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
@@ skipping 21 matching lines @@
 class NativeRunnerDelegateImpl : public mojo::shell::NativeRunnerDelegate {
  public:
   NativeRunnerDelegateImpl() {}
   ~NativeRunnerDelegateImpl() override {}
 
  private:
   // mojo::shell::NativeRunnerDelegate:
   void AdjustCommandLineArgumentsForTarget(
       const mojo::shell::Identity& target,
       base::CommandLine* command_line) override {
-    if (target.url() != GURL("exe:chrome")) {
-      if (target.url() == GURL("exe:chrome_mash"))
+    if (target.name() != "exe:chrome") {
+      if (target.name() == "exe:chrome_mash")
         ChangeChromeMashToChrome(command_line);
       command_line->AppendSwitchASCII(switches::kProcessType, kMashChild);
 #if defined(OS_WIN)
       command_line->AppendArg(switches::kPrefetchArgumentOther);
 #endif
       return;
     }
 
     base::CommandLine::StringVector argv(command_line->argv());
     auto iter =
@@ skipping 25 matching lines @@
   // in chrome.
   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(GURL("exe:chrome_mash"))));
+      background_shell.CreateShellClientRequest("exe:chrome_mash")));
   shell_connection_->WaitForInitialize();
   shell_connection_->connector()->Connect("mojo:mash_shell");
   base::MessageLoop::current()->Run();
 }
 
 void MashRunner::RunChild() {
   base::i18n::InitializeICU();
   mojo::shell::ChildProcessMain(
       base::Bind(&MashRunner::StartChildApp, base::Unretained(this)));
 }
@@ skipping 15 matching lines @@
   // TODO(sky): wire this up correctly.
   logging::LoggingSettings settings;
   settings.logging_dest = logging::LOG_TO_SYSTEM_DEBUG_LOG;
   logging::InitLogging(settings);
   // To view log output with IDs and timestamps use "adb logcat -v threadtime".
   logging::SetLogItems(false,   // Process ID
                        false,   // Thread ID
                        false,   // Timestamp
                        false);  // Tick count
 
-  mojo::RegisterMojoSchemes();
   // TODO(sky): use MessagePumpMojo.
   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;
 }