Shell: switches cleanup.

shell/context.cc

 // Copyright 2013 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 "shell/context.h"
 
 #include <vector>
 
 #include "base/base_switches.h"
 #include "base/bind.h"
@@ skipping 43 matching lines @@
     mojo::embedder::Init(
         make_scoped_ptr(new mojo::embedder::SimplePlatformSupport()));
   }
 
   ~Setup() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(Setup);
 };
 
+ApplicationManager::Options MakeApplicationManagerOptions() {
+  ApplicationManager::Options options;
+  options.disable_cache = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kDisableCache);
+  options.predictable_app_filenames =
+      base::CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kPredictableAppFilenames);
+  return options;
+}
+
 bool ConfigureURLMappings(const base::CommandLine& command_line,
                           Context* context) {
   URLResolver* resolver = context->url_resolver();
 
   // Configure the resolution of unknown mojo: URLs.
   GURL base_url;
   if (command_line.HasSwitch(switches::kOrigin))
     base_url = GURL(command_line.GetSwitchValueASCII(switches::kOrigin));
   else
     // Use the shell's file root if the base was not specified.
@@ skipping 120 matching lines @@
 
  private:
   Tracer* tracer_;
   mojo::StrongBinding<mojo::ServiceProvider> binding_;
 
   DISALLOW_COPY_AND_ASSIGN(TracingServiceProvider);
 };
 
 }  // namespace
 
-Context::Context(Tracer* tracer) : tracer_(tracer), application_manager_(this) {
+Context::Context(Tracer* tracer)
+    : tracer_(tracer),
+      application_manager_(MakeApplicationManagerOptions(), this) {
   DCHECK(!base::MessageLoop::current());
 
   // By default assume that the local apps reside alongside the shell.
   // TODO(ncbray): really, this should be passed in rather than defaulting.
   // This default makes sense for desktop but not Android.
   base::FilePath shell_dir;
   PathService::Get(base::DIR_MODULE, &shell_dir);
   SetShellFileRoot(shell_dir);
 
   base::FilePath cwd;
@@ skipping 67 matching lines @@
       mojo::embedder::ProcessType::NONE, task_runners_->shell_runner(), this,
       task_runners_->io_runner(), mojo::embedder::ScopedPlatformHandle());
 
   scoped_ptr<NativeRunnerFactory> runner_factory;
   if (command_line.HasSwitch(switches::kEnableMultiprocess))
     runner_factory.reset(new OutOfProcessNativeRunnerFactory(this));
   else
     runner_factory.reset(new InProcessNativeRunnerFactory(this));
   application_manager_.set_blocking_pool(task_runners_->blocking_pool());
   application_manager_.set_native_runner_factory(runner_factory.Pass());
-  application_manager_.set_disable_cache(
-      base::CommandLine::ForCurrentProcess()->HasSwitch(
-          switches::kDisableCache));
 
   InitContentHandlers(&application_manager_, command_line);
   InitNativeOptions(&application_manager_, command_line);
 
   ServiceProviderPtr tracing_services;
   ServiceProviderPtr tracing_exposed_services;
   new TracingServiceProvider(tracer_, GetProxy(&tracing_exposed_services));
   application_manager_.ConnectToApplication(
       GURL("mojo:tracing"), GURL(""), GetProxy(&tracing_services),
       tracing_exposed_services.Pass(), base::Closure());
@@ skipping 48 matching lines @@
     app_urls_.erase(url);
     if (app_urls_.empty() && base::MessageLoop::current()->is_running()) {
       DCHECK_EQ(base::MessageLoop::current()->task_runner(),
                 task_runners_->shell_runner());
       base::MessageLoop::current()->Quit();
     }
   }
 }
 
 }  // namespace shell