Implement ToValue() for SystemMetrics, SystemMemoryInfoKB, DiskInfo, and SwapInfo.

base/process/process_metrics.cc

 // Copyright (c) 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 "base/process/process_metrics.h"
 
 #include "base/values.h"
 
 namespace base {
 
 SystemMetrics SystemMetrics::GetCurrent() {
   SystemMetrics system_metrics;
 
   system_metrics.committed_memory_ = GetSystemCommitCharge();
-#if defined(OS_LINUX) || defined(OS_ANDROID)
   GetSystemMemoryInfo(&system_metrics.memory_info_);
+  GetSystemDiskInfo(&system_metrics.disk_info_);
+#ifdef OS_CHROMEOS
+  GetSwapInfo(&system_metrics.swap_info_);
 #endif
 
   return system_metrics;
 }
 
+Value* SystemMetrics::AsValue() const {
+  DictionaryValue* res = new base::DictionaryValue();
+
+  res->SetInteger("committed_memory", committed_memory_);
+  res->Set("meminfo", memory_info_.AsValue());
+  res->Set("diskinfo", disk_info_.AsValue());
+#ifdef OS_CHROMEOS
+  res->Set("swapinfo", swap_info_.AsValue());
+#endif
+
+  return res;
+}
+
 }  // namespace base