Implemented DeviceStatusCollector::GetDeviceSessionStatus()

chrome/browser/chromeos/policy/device_status_collector.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_
 
 #include <deque>
 #include <string>
 #include <vector>
@@ skipping 25 matching lines @@
 namespace content {
 class NotificationDetails;
 class NotificationSource;
 }
 
 class PrefRegistrySimple;
 class PrefService;
 
 namespace policy {
 
+struct DeviceLocalAccount;
+
 // Collects and summarizes the status of an enterprised-managed ChromeOS device.
 class DeviceStatusCollector {
  public:
   // TODO(bartfab): Remove this once crbug.com/125931 is addressed and a proper
   // way to mock geolocation exists.
   typedef base::Callback<void(
       const content::GeolocationProvider::LocationUpdateCallback& callback)>
           LocationUpdateRequester;
 
   using VolumeInfoFetcher = base::Callback<
@@ skipping 36 matching lines @@
  protected:
   // Check whether the user has been idle for a certain period of time.
   virtual void CheckIdleState();
 
   // Used instead of base::Time::Now(), to make testing possible.
   virtual base::Time GetCurrentTime();
 
   // Callback which receives the results of the idle state check.
   void IdleStateCallback(ui::IdleState state);
 
-  // Returns true if the currently active session is an auto-launched
-  // kiosk session (this enables functionality such as network reporting).
+  // Returns the DeviceLocalAccount associated with the currently active
+  // kiosk session, if the session was auto-launched with zero delay
+  // (this enables functionality such as network reporting).
   // Virtual to allow mocking.
-  virtual bool IsAutoLaunchedKioskSession();
+  virtual scoped_ptr<DeviceLocalAccount> GetAutoLaunchedKioskSessionInfo();
 
   // Samples the current CPU and RAM usage and updates our cache of samples.
   void SampleResourceUsage();
 
   // Returns the percentage of total CPU that each process uses. Virtual so it
   // can be mocked.
   virtual std::vector<double> GetPerProcessCPUUsage();
 
+  // Gets the version of the passed app. Virtual to allow mocking.

[bartfab (slow), 2015/02/16 13:30:33]

Nit: Add a comment that this works for kiosk apps only.

[Andrew T Wilson (Slow), 2015/02/17 10:57:25]

This works for any app - we just grab the version from the extension registry.
It turns out that currently it's only *called* for kiosk apps, but the code
itself has no restrictions on its use.

+  virtual std::string GetAppVersion(const std::string& app_id);
+
   // The number of days in the past to store device activity.
   // This is kept in case device status uploads fail for a number of days.
   unsigned int max_stored_past_activity_days_;
 
   // The number of days in the future to store device activity.
   // When changing the system time and/or timezones, it's possible to record
   // activity time that is slightly in the future.
   unsigned int max_stored_future_activity_days_;
 
  private:
@@ skipping 131 matching lines @@
       session_status_subscription_;
 
   base::WeakPtrFactory<DeviceStatusCollector> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceStatusCollector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_DEVICE_STATUS_COLLECTOR_H_