Mojo: (Mostly) factor out command-line switches from the shell's load code path.

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/command_line.h"
 #include "base/location.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/keep_alive.h"
-#include "mojo/shell/switches.h"
 
 namespace mojo {
 namespace shell {
 
 namespace {
 
 std::string MakeSharedLibraryName(const std::string& file_name) {
 #if defined(OS_WIN)
   return file_name + ".dll";
 #elif defined(OS_LINUX)
@@ skipping 15 matching lines @@
               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 origin =
-          base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-              switches::kOrigin);
       std::string lib = MakeSharedLibraryName(url.ExtractFileName());
-      url_to_load = GURL(origin + "/" + lib);
+      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 55 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