Merge of "Remote fetch device status (attributes and logs) command" to M58

chrome/browser/chromeos/policy/status_uploader.h

 // Copyright (c) 2015 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_STATUS_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 41 matching lines @@
   // This checks to ensure that the current session is a kiosk session, and
   // that no user input (keyboard, mouse, touch, audio/video) has been received.
   bool IsSessionDataUploadAllowed();
 
   // MediaCaptureDevicesDispatcher::Observer implementation
   void OnRequestUpdate(int render_process_id,
                        int render_frame_id,
                        content::MediaStreamType stream_type,
                        const content::MediaRequestState state) override;
 
+  void ScheduleNextStatusUploadImmediately();
+
  private:
   // Callback invoked periodically to upload the device status from the
   // DeviceStatusCollector.
   void UploadStatus();
 
   // Called asynchronously by DeviceStatusCollector when status arrives
   void OnStatusReceived(
       std::unique_ptr<enterprise_management::DeviceStatusReportRequest>
           device_status,
       std::unique_ptr<enterprise_management::SessionStatusReportRequest>
           session_status);
 
   // Invoked once a status upload has completed.
   void OnUploadCompleted(bool success);
 
   // Helper method that figures out when the next status upload should
   // be scheduled.
-  void ScheduleNextStatusUpload();
+  void ScheduleNextStatusUpload(bool immediately = false);
 
   // Updates the upload frequency from settings and schedules a new upload
   // if appropriate.
   void RefreshUploadFrequency();
 
   // CloudPolicyClient used to issue requests to the server.
   CloudPolicyClient* client_;
 
   // DeviceStatusCollector that provides status for uploading.
   std::unique_ptr<DeviceStatusCollector> collector_;
@@ skipping 10 matching lines @@
 
   // The time the last upload was performed.
   base::Time last_upload_;
 
   // Callback invoked via a delay to upload device status.
   base::CancelableClosure upload_callback_;
 
   // True if there has been any captured media in this session.
   bool has_captured_media_;
 
+  // Used to prevent a race condition where two status uploads are being
+  // executed in parallel.
+  bool status_upload_in_progress_ = false;
+
   // Note: This should remain the last member so it'll be destroyed and
   // invalidate the weak pointers before any other members are destroyed.
   base::WeakPtrFactory<StatusUploader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(StatusUploader);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_STATUS_UPLOADER_H_