Updated device reporting code to report multiple samples of free RAM

chrome/browser/chromeos/policy/device_status_collector_browsertest.cc

 // Copyright (c) 2012 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 "chrome/browser/chromeos/policy/device_status_collector.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 107 matching lines @@
     baseline_offset_periods_ = 0;
   }
 
   void set_mock_cpu_usage(double total_cpu_usage, int num_processors) {
     std::vector<double> usage;
     for (int i = 0; i < num_processors; ++i)
       usage.push_back(total_cpu_usage / num_processors);
 
     mock_cpu_usage_ = usage;
 
-    // Refresh our samples.
-    for (int i = 0; i < static_cast<int>(kMaxCPUSamples); ++i)
-      SampleCPUUsage();
+    RefreshSampleResourceUsage();
+  }
+
+  void RefreshSampleResourceUsage() {
+    // Refresh our samples. Sample more than kMaxHardwareSamples times to
+    // make sure that the code correctly caps the number of cached samples.
+    for (int i = 0; i < static_cast<int>(kMaxResourceUsageSamples + 1); ++i)
+      SampleResourceUsage();
   }
 
  protected:
   void CheckIdleState() override {
     // This should never be called in testing, as it results in a dbus call.
     ADD_FAILURE();
   }
 
   // Each time this is called, returns a time that is a fixed increment
   // later than the previous time.
@@ skipping 642 matching lines @@
                        << expected_info.volume_id();
   }
 
   // Now turn off hardware status reporting - should have no data.
   cros_settings_->SetBoolean(chromeos::kReportDeviceHardwareStatus, false);
   GetStatus();
   EXPECT_EQ(0, status_.volume_info_size());
 }
 
 TEST_F(DeviceStatusCollectorTest, TestAvailableMemory) {
+  status_collector_->RefreshSampleResourceUsage();
   GetStatus();
-  EXPECT_TRUE(status_.has_system_ram_free());
+  EXPECT_EQ(static_cast<int>(DeviceStatusCollector::kMaxResourceUsageSamples),
+            status_.system_ram_free().size());
   EXPECT_TRUE(status_.has_system_ram_total());
   // No good way to inject specific test values for available system RAM, so
   // just make sure it's > 0.
   EXPECT_GT(status_.system_ram_total(), 0);
 }
 
 TEST_F(DeviceStatusCollectorTest, TestCPUSamples) {
   // Mock 100% CPU usage and 2 processors.
   const int full_cpu_usage = 100;
   status_collector_->set_mock_cpu_usage(full_cpu_usage, 2);
   GetStatus();
-  EXPECT_EQ(static_cast<int>(DeviceStatusCollector::kMaxCPUSamples),
+  EXPECT_EQ(static_cast<int>(DeviceStatusCollector::kMaxResourceUsageSamples),
             status_.cpu_utilization_pct().size());
   for (const auto utilization : status_.cpu_utilization_pct())
     EXPECT_EQ(full_cpu_usage, utilization);
 
   // Now set CPU usage to 0.
   const int idle_cpu_usage = 0;
   status_collector_->set_mock_cpu_usage(idle_cpu_usage, 2);
   GetStatus();
-  EXPECT_EQ(static_cast<int>(DeviceStatusCollector::kMaxCPUSamples),
+  EXPECT_EQ(static_cast<int>(DeviceStatusCollector::kMaxResourceUsageSamples),
             status_.cpu_utilization_pct().size());
   for (const auto utilization : status_.cpu_utilization_pct())
     EXPECT_EQ(idle_cpu_usage, utilization);
 
   // Turning off hardware reporting should not report CPU utilization.
   cros_settings_->SetBoolean(chromeos::kReportDeviceHardwareStatus, false);
   GetStatus();
   EXPECT_EQ(0, status_.cpu_utilization_pct().size());
 }
 
@@ skipping 262 matching lines @@
         found_match = true;
         break;
       }
     }
     EXPECT_TRUE(found_match) << "No matching state for fake network "
                              << " (" << state.name << ")";
   }
 }
 
 }  // namespace policy