Shell: switches cleanup.

shell/application_manager/application_manager.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 "shell/application_manager/application_manager.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/macros.h"
@@ skipping 76 matching lines @@
 
 bool ApplicationManager::TestAPI::HasCreatedInstance() {
   return has_created_instance;
 }
 
 bool ApplicationManager::TestAPI::HasFactoryForURL(const GURL& url) const {
   return manager_->identity_to_shell_impl_.find(Identity(url)) !=
          manager_->identity_to_shell_impl_.end();
 }
 
-ApplicationManager::ApplicationManager(Delegate* delegate)
-    : delegate_(delegate),
+ApplicationManager::ApplicationManager(const Options& options,
+                                       Delegate* delegate)
+    : options_(options),
+      delegate_(delegate),
       blocking_pool_(nullptr),
-      disable_cache_(false),
       weak_ptr_factory_(this) {
 }
 
 ApplicationManager::~ApplicationManager() {
 }
 
 void ApplicationManager::TerminateShellConnections() {
   identity_to_shell_impl_.clear();
 }
 
@@ skipping 68 matching lines @@
                      callback);
     return;
   }
 
   if (!network_service_) {
     ConnectToService(GURL("mojo:network_service"), &network_service_);
     ConnectToService(GURL("mojo:url_response_disk_cache"),
                      &url_response_disk_cache_);
   }
 
-  new NetworkFetcher(disable_cache_, resolved_url, network_service_.get(),
+  new NetworkFetcher(options_.disable_cache, options_.predictable_app_filenames,
+                     resolved_url, network_service_.get(),
                      url_response_disk_cache_.get(), callback);
 }
 
 bool ApplicationManager::ConnectToRunningApplication(
     const GURL& resolved_url,
     const GURL& requestor_url,
     InterfaceRequest<ServiceProvider>* services,
     ServiceProviderPtr* exposed_services) {
   GURL application_url = GetBaseURLAndQuery(resolved_url, nullptr);
   ShellImpl* shell_impl = GetShellImpl(application_url);
@@ skipping 277 matching lines @@
     return args_it->second;
   return std::vector<std::string>();
 }
 
 void ApplicationManager::CleanupRunner(NativeRunner* runner) {
   native_runners_.erase(
       std::find(native_runners_.begin(), native_runners_.end(), runner));
 }
 
 }  // namespace shell