Fix that switch "--disk-cache-dir" has no effect when specifying a path containing non-ascii charac…

chrome/browser/prefs/command_line_pref_store.cc

 // Copyright (c) 2012 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 "chrome/browser/prefs/command_line_pref_store.h"
 
 #include <string>
 #include <vector>
 
+#include "base/files/file_path.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/values.h"
 #include "chrome/browser/prefs/proxy_config_dictionary.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
 #include "ui/base/ui_base_switches.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/chromeos_switches.h"
 #endif
 
 const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
     CommandLinePrefStore::string_switch_map_[] = {
       { switches::kLang, prefs::kApplicationLocale },
       { switches::kAuthSchemes, prefs::kAuthSchemes },
       { switches::kAuthServerWhitelist, prefs::kAuthServerWhitelist },
       { switches::kAuthNegotiateDelegateWhitelist,
           prefs::kAuthNegotiateDelegateWhitelist },
       { switches::kGSSAPILibraryName, prefs::kGSSAPILibraryName },
       { data_reduction_proxy::switches::kDataReductionProxy,
           data_reduction_proxy::prefs::kDataReductionProxy },
-      { switches::kDiskCacheDir, prefs::kDiskCacheDir },
       { switches::kSSLVersionMin, prefs::kSSLVersionMin },
       { switches::kSSLVersionMax, prefs::kSSLVersionMax },
 };
 
+const CommandLinePrefStore::PathSwitchToPreferenceMapEntry
+    CommandLinePrefStore::path_switch_map_[] = {
+      { switches::kDiskCacheDir, prefs::kDiskCacheDir },
+};
+
 const CommandLinePrefStore::BooleanSwitchToPreferenceMapEntry
     CommandLinePrefStore::boolean_switch_map_[] = {
       { switches::kDisableAuthNegotiateCnameLookup,
           prefs::kDisableAuthNegotiateCnameLookup, true },
       { switches::kEnableAuthNegotiatePort, prefs::kEnableAuthNegotiatePort,
           true },
       { switches::kDisable3DAPIs, prefs::kDisable3DAPIs, true },
       { switches::kEnableCloudPrintProxy, prefs::kCloudPrintProxyEnabled,
           true },
       { switches::kAllowOutdatedPlugins, prefs::kPluginsAllowOutdated, true },
@@ skipping 48 matching lines @@
 void CommandLinePrefStore::ApplySimpleSwitches() {
   // Look for each switch we know about and set its preference accordingly.
   for (size_t i = 0; i < arraysize(string_switch_map_); ++i) {
     if (command_line_->HasSwitch(string_switch_map_[i].switch_name)) {
       SetValue(string_switch_map_[i].preference_path,
                new base::StringValue(command_line_->GetSwitchValueASCII(
                    string_switch_map_[i].switch_name)));
     }
   }
 
+  for (size_t i = 0; i < arraysize(path_switch_map_); ++i) {
+    if (command_line_->HasSwitch(path_switch_map_[i].switch_name)) {
+      SetValue(path_switch_map_[i].preference_path,
+               new base::StringValue(command_line_->GetSwitchValuePath(
+                   path_switch_map_[i].switch_name).value()));
+    }
+  }
+
   for (size_t i = 0; i < arraysize(integer_switch_map_); ++i) {
     if (command_line_->HasSwitch(integer_switch_map_[i].switch_name)) {
       std::string str_value = command_line_->GetSwitchValueASCII(
           integer_switch_map_[i].switch_name);
       int int_value = 0;
       if (!base::StringToInt(str_value, &int_value)) {
         LOG(ERROR) << "The value " << str_value << " of "
                    << integer_switch_map_[i].switch_name
                    << " can not be converted to integer, ignoring!";
         continue;
@@ skipping 46 matching lines @@
       list_value->Append(new base::StringValue(*it));
     }
     SetValue(prefs::kCipherSuiteBlacklist, list_value);
   }
 }
 
 void CommandLinePrefStore::ApplyBackgroundModeSwitches() {
   if (command_line_->HasSwitch(switches::kDisableExtensions))
     SetValue(prefs::kBackgroundModeEnabled, new base::FundamentalValue(false));
 }