Add stub implementations for state keys and VPD

chromeos/system/statistics_provider.cc

 // Copyright 2013 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 "chromeos/system/statistics_provider.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 43 matching lines @@
 // login-manager/init/machine-info.conf.
 const char kMachineHardwareInfoEq[] = "=";
 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 kEchoCouponEq[] = "=";
 const char kEchoCouponDelim[] = "\n";
 
-// File to get VPD info from, and key/value delimiters of the file.
-const char kVpdFile[] = "/var/log/vpd_2.0.txt";
+// Key/value delimiters for VPD file.
 const char kVpdEq[] = "=";
 const char kVpdDelim[] = "\n";
 
 // File to get regional data from.
 const char kCrosRegions[] = "/usr/share/misc/cros-regions.json";
 
 // Timeout that we should wait for statistics to get loaded
 const int kTimeoutSecs = 3;
 
 // The location of OEM manifest file used to trigger OOBE flow for kiosk mode.
@@ skipping 388 matching lines @@
   PathService::Get(chromeos::FILE_MACHINE_INFO, &machine_info_path);
   if (!base::SysInfo::IsRunningOnChromeOS() &&
       !base::PathExists(machine_info_path)) {
     // Use time value to create an unique stub serial because clashes of the
     // same serial for the same domain invalidate earlier enrollments. Persist
     // to disk to keep it constant across restarts (required for re-enrollment
     // testing).
     std::string stub_contents =
         "\"serial_number\"=\"stub_" +
         base::Int64ToString(base::Time::Now().ToJavaTime()) + "\"\n";
-    int bytes_written = base::WriteFile(machine_info_path,
-                                        stub_contents.c_str(),
-                                        stub_contents.size());
-    // static_cast<int> is fine because stub_contents is small.
+    int bytes_written = base::WriteFile(
+        machine_info_path, stub_contents.c_str(), stub_contents.size());
     if (bytes_written < static_cast<int>(stub_contents.size())) {
       LOG(ERROR) << "Error writing machine info stub: "

[Daniel Erat, 2017/03/23 23:35:23]

nit: PLOG(ERROR) will include errno

[Thiemo Nagel, 2017/04/11 15:29:32]

Done.

                  << machine_info_path.value();
     }
   }
 
+  base::FilePath vpd_path;
+  PathService::Get(chromeos::FILE_VPD, &vpd_path);
+  if (!base::SysInfo::IsRunningOnChromeOS() && !base::PathExists(vpd_path)) {
+    std::string stub_contents = "\"ActivateDate\"=\"2000-01\"\n";
+    int bytes_written =
+        base::WriteFile(vpd_path, stub_contents.c_str(), stub_contents.size());
+    if (bytes_written < static_cast<int>(stub_contents.size())) {
+      LOG(ERROR) << "Error writing vpd stub: " << vpd_path.value();

[Daniel Erat, 2017/03/23 23:35:23]

PLOG(ERROR) here as well

[Thiemo Nagel, 2017/04/11 15:29:32]

Done.

+    }
+  }
+
   parser.GetNameValuePairsFromFile(machine_info_path,
                                    kMachineHardwareInfoEq,
                                    kMachineHardwareInfoDelim);
   parser.GetNameValuePairsFromFile(base::FilePath(kEchoCouponFile),
                                    kEchoCouponEq,
                                    kEchoCouponDelim);
-  parser.GetNameValuePairsFromFile(base::FilePath(kVpdFile),
+  parser.GetNameValuePairsFromFile(vpd_path,
                                    kVpdEq,
                                    kVpdDelim);
 
   // Ensure that the hardware class key is present with the expected
   // key name, and if it couldn't be retrieved, that the value is "unknown".
   std::string hardware_class = machine_info_[kHardwareClassCrosSystemKey];
   if (hardware_class.empty() || hardware_class == kCrosSystemValueError) {
     machine_info_[kHardwareClassKey] = kHardwareClassValueUnknown;
   } else {
     machine_info_[kHardwareClassKey] = hardware_class;
@@ skipping 116 matching lines @@
   return StatisticsProviderImpl::GetInstance();
 }
 
 // static
 void StatisticsProvider::SetTestProvider(StatisticsProvider* test_provider) {
   g_test_statistics_provider = test_provider;
 }
 
 }  // namespace system
 }  // namespace chromeos