kiosk: Add status report for os update and running app

chrome/browser/chromeos/settings/device_settings_provider_unittest.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/settings/device_settings_provider.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 62 matching lines @@
     em::DeviceReportingProto* proto =
         device_policy_.payload().mutable_device_reporting();
     proto->set_report_version_info(enable_reporting);
     proto->set_report_activity_times(enable_reporting);
     proto->set_report_boot_mode(enable_reporting);
     proto->set_report_location(enable_reporting);
     proto->set_report_network_interfaces(enable_reporting);
     proto->set_report_users(enable_reporting);
     proto->set_report_hardware_status(enable_reporting);
     proto->set_report_session_status(enable_reporting);
+    proto->set_report_os_update_status(enable_reporting);
+    proto->set_report_running_kiosk_app(enable_reporting);
     proto->set_device_status_frequency(frequency);
     device_policy_.Build();
     device_settings_test_helper_.set_policy_blob(device_policy_.GetBlob());
     ReloadDeviceSettings();
     Mock::VerifyAndClearExpectations(this);
   }
 
   // Helper routine to enable/disable all reporting settings in policy.
   void SetHeartbeatSettings(bool enable_heartbeat, int frequency) {
     EXPECT_CALL(*this, SettingChanged(_)).Times(AtLeast(1));
@@ skipping 51 matching lines @@
                                int expected_frequency) {
     const char* reporting_settings[] = {
       kReportDeviceVersionInfo,
       kReportDeviceActivityTimes,
       kReportDeviceBootMode,
       // Device location reporting is not currently supported.
       // kReportDeviceLocation,
       kReportDeviceNetworkInterfaces,
       kReportDeviceUsers,
       kReportDeviceHardwareStatus,
-      kReportDeviceSessionStatus
+      kReportDeviceSessionStatus,
+      kReportOsUpdateStatus,
+      kReportRunningKioskApp
     };
 
     const base::FundamentalValue expected_enable_value(expected_enable_state);
     for (const auto& setting : reporting_settings) {
       EXPECT_TRUE(base::Value::Equals(provider_->Get(setting),
                                       &expected_enable_value))
           << "Value for " << setting << " does not match expected";
     }
     const base::FundamentalValue expected_frequency_value(expected_frequency);
     EXPECT_TRUE(base::Value::Equals(provider_->Get(kReportUploadFrequency),
@@ skipping 333 matching lines @@
 }
 
 TEST_F(DeviceSettingsProviderTest, DecodeLogUploadSettings) {
   SetLogUploadSettings(true);
   VerifyLogUploadSettings(true);
 
   SetLogUploadSettings(false);
   VerifyLogUploadSettings(false);
 }
 } // namespace chromeos