Shell: switches cleanup.

shell/application_manager/network_fetcher.cc

 // Copyright 2015 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/network_fetcher.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/process/process.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/trace_event/trace_event.h"
 #include "crypto/secure_hash.h"
 #include "crypto/sha2.h"
 #include "mojo/common/common_type_converters.h"
 #include "mojo/common/data_pipe_utils.h"
 #include "mojo/services/network/public/interfaces/network_service.mojom.h"
 #include "shell/application_manager/data_pipe_peek.h"
-#include "shell/switches.h"
 
 namespace shell {
 
 NetworkFetcher::NetworkFetcher(
     bool disable_cache,
+    bool predictable_app_filenames,
     const GURL& url,
     mojo::NetworkService* network_service,
     mojo::URLResponseDiskCache* url_response_disk_cache,
     const FetchCallback& loader_callback)
     : Fetcher(loader_callback),
-      disable_cache_(false),
+      disable_cache_(disable_cache),
+      predictable_app_filenames_(predictable_app_filenames),
       url_(url),
       url_response_disk_cache_(url_response_disk_cache),
       weak_ptr_factory_(this) {
   StartNetworkRequest(url, network_service);
 }
 
 NetworkFetcher::~NetworkFetcher() {
 }
 
 const GURL& NetworkFetcher::GetURL() const {
@@ skipping 105 matching lines @@
 }
 
 void NetworkFetcher::OnFileRetrievedFromCache(
     base::Callback<void(const base::FilePath&, bool)> callback,
     mojo::Array<uint8_t> path_as_array,
     mojo::Array<uint8_t> cache_dir) {
   bool success = !path_as_array.is_null();
   if (success) {
     path_ = base::FilePath(std::string(
         reinterpret_cast<char*>(&path_as_array.front()), path_as_array.size()));
-    if (base::CommandLine::ForCurrentProcess()->HasSwitch(
-            switches::kPredictableAppFilenames)) {
+    if (predictable_app_filenames_) {
       // The copy completed, now move to $TMP/$APP_ID.mojo before the dlopen.
       base::FilePath new_path;
       if (RenameToAppId(url_, path_, &new_path)) {
         if (base::PathExists(new_path)) {
           path_ = new_path;
           success = true;
         }
       }
     }
   }
@@ skipping 65 matching lines @@
                << "while fetching " << response->url;
     loader_callback_.Run(nullptr);
     return;
   }
 
   response_ = response.Pass();
   loader_callback_.Run(owner.Pass());
 }
 
 }  // namespace shell