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

Index: chrome/browser/prefs/command_line_pref_store.cc
diff --git a/chrome/browser/prefs/command_line_pref_store.cc b/chrome/browser/prefs/command_line_pref_store.cc
index 22c4aa997bbde8143c3a9df46c9d53a1c0c98707..413e75b00f82ec91873103bfeea9d6a32ce10a25 100644
--- a/chrome/browser/prefs/command_line_pref_store.cc
+++ b/chrome/browser/prefs/command_line_pref_store.cc
@@ -7,6 +7,7 @@
 #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"
@@ -30,11 +31,15 @@ const CommandLinePrefStore::StringSwitchToPreferenceMapEntry
       { 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,
@@ -103,6 +108,14 @@ void CommandLinePrefStore::ApplySimpleSwitches() {
     }
   }
 
+  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(