Add OS and firmware version to device status reports.

chrome/browser/policy/device_status_collector.h

Index: chrome/browser/policy/device_status_collector.h
diff --git a/chrome/browser/policy/device_status_collector.h b/chrome/browser/policy/device_status_collector.h
index cef45ffe4f413c2d66006ab9c628d8c67430b9f7..2bdd8a72992801e90ac42f58c5c9e0e2b419975b 100644
--- a/chrome/browser/policy/device_status_collector.h
+++ b/chrome/browser/policy/device_status_collector.h
@@ -8,9 +8,11 @@
 
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/chromeos/version_loader.h"
 #include "chrome/browser/idle.h"
 
 using base::Time;
+using chromeos::VersionLoader;

[Joao da Silva, 2011/12/12 14:23:04]

Nit: I'd avoid this, but it's your call. I'd rather have these on the .cc file
only; otherwise whoever includes this header will have these names in the global
namespace.

[Patrick Dubroy, 2011/12/12 15:18:01]

Done.

 
 namespace enterprise_management {
 class DeviceStatusReportRequest;
@@ -49,6 +51,12 @@ class DeviceStatusCollector {
  private:
   void AddActivePeriod(base::Time start, base::Time end);
 
+  // Callbacks from chromeos::VersionLoader.
+  void OnOSVersion(VersionLoader::Handle handle,
+                   std::string version);
+  void OnOSFirmware(VersionLoader::Handle handle,
+                    std::string version);
+
   // How often to poll to see if the user is idle.
   int poll_interval_seconds_;
 
@@ -62,6 +70,12 @@ class DeviceStatusCollector {
 
   base::RepeatingTimer<DeviceStatusCollector> timer_;
 
+  VersionLoader version_loader_;
+  CancelableRequestConsumer consumer_;
+
+  std::string os_version_;
+  std::string firmware_version_;
+
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };