Introduce very beginning of navigation

mojo/shell/dynamic_service_loader.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/dynamic_service_loader.h"
 
 #include "base/location.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/keep_alive.h"
+#include "url/url_util.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
-std::string MakeSharedLibraryName(const std::string& file_name) {
+std::string MakeSharedLibraryName(const std::string& base_name) {

[Aaron Boodman, 2014/06/10 19:41:29]

I changed the mojo scheme to be a 'standard' scheme as defined by url_util.h.
So-called 'standard' schemes are different from non-standard schemes because
they have a host component.

I think this is important to make the origin concept be equivalent to the web
one, where origin == scheme+host+port.

With that change, all the pathnames started being empty, so I had to change
this.

 #if defined(OS_WIN)
-  return file_name + ".dll";
+  return base_name + ".dll";
 #elif defined(OS_LINUX)
-  return "lib" + file_name + ".so";
+  return "lib" + base_name + ".so";
 #elif defined(OS_MACOSX)
-  return "lib" + file_name + ".dylib";
+  return "lib" + base_name + ".dylib";
 #else
   NOTREACHED() << "dynamic loading of services not supported";
   return std::string();
 #endif
 }
 
 }  // namespace
 
 class DynamicServiceLoader::LoadContext : public mojo::shell::Loader::Delegate {
  public:
   LoadContext(DynamicServiceLoader* loader,
               const GURL& url,
               ScopedMessagePipeHandle service_handle,
               scoped_ptr<DynamicServiceRunner> runner)
       : loader_(loader),
         url_(url),
         service_handle_(service_handle.Pass()),
         runner_(runner.Pass()),
         keep_alive_(loader->context_) {
     GURL url_to_load;
 
     if (url.SchemeIs("mojo")) {
-      std::string lib = MakeSharedLibraryName(url.ExtractFileName());
+      std::string lib = MakeSharedLibraryName(url.host());
       url_to_load = GURL(loader->context_->mojo_origin() + "/" + lib);
     } else {
       url_to_load = url;
     }
 
     request_ = loader_->context_->loader()->Load(url_to_load, this);
   }
 
   virtual ~LoadContext() {
   }
@@ skipping 23 matching lines @@
   KeepAlive keep_alive_;
 
   DISALLOW_COPY_AND_ASSIGN(LoadContext);
 };
 
 DynamicServiceLoader::DynamicServiceLoader(
     Context* context,
     scoped_ptr<DynamicServiceRunnerFactory> runner_factory)
     : context_(context),
       runner_factory_(runner_factory.Pass()) {
+  url::AddStandardScheme("mojo");
 }
 
 DynamicServiceLoader::~DynamicServiceLoader() {
   DCHECK(url_to_load_context_.empty());
 }
 
 void DynamicServiceLoader::LoadService(ServiceManager* manager,
                                        const GURL& url,
                                        ScopedMessagePipeHandle service_handle) {
   DCHECK(url_to_load_context_.find(url) == url_to_load_context_.end());
@@ skipping 13 matching lines @@
   DCHECK(it != url_to_load_context_.end()) << url;
 
   LoadContext* doomed = it->second;
   url_to_load_context_.erase(it);
 
   delete doomed;
 }
 
 }  // namespace shell
 }  // namespace mojo