Reset user data directory and disk cache directory after downgrade.

chrome/browser/policy/policy_path_parser_win.cc

Index: chrome/browser/policy/policy_path_parser_win.cc
diff --git a/chrome/browser/policy/policy_path_parser_win.cc b/chrome/browser/policy/policy_path_parser_win.cc
index 7ec15f23d76a79660941bd28c84921c58cd0e66a..dcb8d41376260cf8dddd02d44fb7a1191c9a1a49 100644
--- a/chrome/browser/policy/policy_path_parser_win.cc
+++ b/chrome/browser/policy/policy_path_parser_win.cc
@@ -19,9 +19,11 @@
 namespace {
 
 // Checks if the key exists in the given hive and expands any string variables.
-bool LoadUserDataDirPolicyFromRegistry(HKEY hive, base::FilePath* dir) {
+bool LoadUserDataDirPolicyFromRegistry(HKEY hive,
+                                       const char* key_name_str,
+                                       base::FilePath* dir) {
   base::string16 value;
-  base::string16 key_name(base::ASCIIToUTF16(policy::key::kUserDataDir));
+  base::string16 key_name(base::ASCIIToUTF16(key_name_str));
   base::win::RegKey key(hive, policy::kRegistryChromePolicyKey, KEY_READ);
   if (key.ReadValue(key_name.c_str(), &value) == ERROR_SUCCESS) {
     *dir = base::FilePath(policy::path_parser::ExpandPathVariables(value));
@@ -147,8 +149,18 @@ base::FilePath::StringType ExpandPathVariables(
 void CheckUserDataDirPolicy(base::FilePath* user_data_dir) {
   DCHECK(user_data_dir);
   // Policy from the HKLM hive has precedence over HKCU.
-  if (!LoadUserDataDirPolicyFromRegistry(HKEY_LOCAL_MACHINE, user_data_dir))
-    LoadUserDataDirPolicyFromRegistry(HKEY_CURRENT_USER, user_data_dir);
+  if (!LoadUserDataDirPolicyFromRegistry(
+          HKEY_LOCAL_MACHINE, policy::key::kUserDataDir, user_data_dir))

[grt (UTC plus 2), 2016/05/19 23:39:27]

nit: "policy::" isn't needed since this function is within the
policy::path_parser namespace

[grt (UTC plus 2), 2016/05/19 23:39:27]

nit: braces for multi-line conditional and body (below, too)

[zmin, 2016/05/20 00:52:25]

Done.

[zmin, 2016/05/20 00:52:25]

Done.

+    LoadUserDataDirPolicyFromRegistry(HKEY_CURRENT_USER,
+                                      policy::key::kUserDataDir, user_data_dir);
+}
+
+void CheckDiskCacheDirPolicy(base::FilePath* disk_cache_dir) {
+  DCHECK(disk_cache_dir);
+  if (!LoadUserDataDirPolicyFromRegistry(
+          HKEY_LOCAL_MACHINE, policy::key::kDiskCacheDir, disk_cache_dir))
+    LoadUserDataDirPolicyFromRegistry(
+        HKEY_CURRENT_USER, policy::key::kDiskCacheDir, disk_cache_dir);
 }
 
 }  // namespace path_parser