Update VPD cache file location.

In https://chromium-review.googlesource.com/#/c/32606/ VPD cache files
have been migrated to unencrypted stateful and symlinks have been placed
in the original locations for backward compatibility.

This CL updates the file locations inside Chrome so that we may
eventually get rid of the symlinks and can drop the exceptions for them,
cf. https://crbug.com/655606.

BUG=none

Review-Url: https://codereview.chromium.org/1736493002
Cr-Commit-Position: refs/heads/master@{#467645}

chromeos/chromeos_paths.cc

@@ -32,8 +32,8 @@ const base::FilePath::CharType kInstallAttributesFileName[] =
 const base::FilePath::CharType kMachineHardwareInfoFileName[] =
     FILE_PATH_LITERAL("/tmp/machine-info");
 
-const base::FilePath::CharType kVpdFileName[] =
-    FILE_PATH_LITERAL("/var/log/vpd_2.0.txt");
+const base::FilePath::CharType kVpdFileName[] = FILE_PATH_LITERAL(
+    "/mnt/stateful_partition/unencrypted/cache/vpd/filtered.txt");
 
 const base::FilePath::CharType kUptimeFileName[] =
     FILE_PATH_LITERAL("/proc/uptime");

chromeos/system/statistics_provider.cc

@@ -57,7 +57,8 @@ const char kMachineHardwareInfoDelim[] = " \n";
 
 // File to get ECHO coupon info from, and key/value delimiters of
 // the file.
-const char kEchoCouponFile[] = "/var/cache/echo/vpd_echo.txt";
+const char kEchoCouponFile[] =
+    "/mnt/stateful_partition/unencrypted/cache/vpd/echo/vpd_echo.txt";
 const char kEchoCouponEq[] = "=";
 const char kEchoCouponDelim[] = "\n";