Change Mojo URLs to structured names

mojo/shell/tests/package_test_package.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 <stddef.h>
 #include <stdint.h>
 
 #include <utility>
 
 #include "base/bind.h"
@@ skipping 30 matching lines @@
         name_(name),
         request_(std::move(request)) {
     Start();
   }
   ~ProvidedShellClient() override {
     Join();
   }
 
  private:
   // mojo::ShellClient:
-  void Initialize(Connector* connector, const std::string& url,
+  void Initialize(Connector* connector, const std::string& name,
                   uint32_t id, uint32_t user_id) override {
     bindings_.set_connection_error_handler(
         base::Bind(&ProvidedShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<test::mojom::PackageTestService>(
         this);
     return true;
   }
@@ skipping 33 matching lines @@
       public InterfaceFactory<mojom::ShellClientFactory>,
       public InterfaceFactory<test::mojom::PackageTestService>,
       public mojom::ShellClientFactory,
       public test::mojom::PackageTestService {
  public:
   PackageTestShellClient() {}
   ~PackageTestShellClient() override {}
 
  private:
   // mojo::ShellClient:
-  void Initialize(Connector* connector, const std::string& url,
+  void Initialize(Connector* connector, const std::string& name,
                   uint32_t id, uint32_t user_id) override {
     bindings_.set_connection_error_handler(
         base::Bind(&PackageTestShellClient::OnConnectionError,
                    base::Unretained(this)));
   }
   bool AcceptConnection(Connection* connection) override {
     connection->AddInterface<ShellClientFactory>(this);
     connection->AddInterface<test::mojom::PackageTestService>(this);
     return true;
   }
@@ skipping 12 matching lines @@
   }
 
   // InterfaceFactory<test::mojom::PackageTestService>:
   void Create(Connection* connection,
               test::mojom::PackageTestServiceRequest request) override {
     bindings_.AddBinding(this, std::move(request));
   }
 
   // mojom::ShellClientFactory:
   void CreateShellClient(mojom::ShellClientRequest request,
-                         const String& url) override {
-    if (url == "mojo://package_test_a/")
+                         const String& name) override {
+    if (name == "mojo:package_test_a")
       new ProvidedShellClient("A", std::move(request));
-    else if (url == "mojo://package_test_b/")
+    else if (name == "mojo:package_test_b")
       new ProvidedShellClient("B", std::move(request));
   }
 
   // test::mojom::PackageTestService:
   void GetName(const GetNameCallback& callback) override {
     callback.Run("ROOT");
   }
 
   void OnConnectionError() {
     if (bindings_.empty())
       base::MessageLoop::current()->QuitWhenIdle();
   }
 
   std::vector<scoped_ptr<ShellClient>> delegates_;
   BindingSet<mojom::ShellClientFactory> shell_client_factory_bindings_;
   BindingSet<test::mojom::PackageTestService> bindings_;
 
   DISALLOW_COPY_AND_ASSIGN(PackageTestShellClient);
 };
 
 }  // namespace shell
 }  // namespace mojo
 
 
 MojoResult MojoMain(MojoHandle shell_handle) {
   MojoResult rv = mojo::ApplicationRunner(
       new mojo::shell::PackageTestShellClient).Run(shell_handle);
   return rv;
 }