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

chrome/browser/chromeos/policy/system_log_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_SYSTEM_LOG_UPLOADER_H_
 #define CHROME_BROWSER_CHROMEOS_POLICY_SYSTEM_LOG_UPLOADER_H_
 
 #include <stdint.h>
 
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread_checker.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/policy/upload_job.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 
@@ skipping 61 matching lines @@
   // upload job.
   void OnSuccess() override;
   void OnFailure(UploadJob::ErrorCode error_code) override;
 
   // Remove lines from |data| that contain common PII (IP addresses, BSSIDs,
   // SSIDs, URLs, e-mail addresses).
   static std::string RemoveSensitiveData(
       feedback::AnonymizerTool* const anonymizer,
       const std::string& data);
 
+  void ScheduleNextSystemLogUploadImmediately();
+
  private:
   // Updates the system log upload enabled field from settings.
   void RefreshUploadSettings();
 
   // Starts the system log loading process.
   void StartLogUpload();
 
   // The callback is invoked by the Delegate if system logs have been loaded
   // from disk, uploads system logs.
   void UploadSystemLogs(std::unique_ptr<SystemLogs> system_logs);
@@ skipping 24 matching lines @@
   // CrosSettings can switch to an unstrusted state temporarily, and we want to
   // use the last-known trusted values.
   bool upload_enabled_;
 
   // Observer to changes in system log upload settings.
   std::unique_ptr<chromeos::CrosSettings::ObserverSubscription>
       upload_enabled_observer_;
 
   base::ThreadChecker thread_checker_;
 
+  // Used to prevent a race condition where two log uploads are being executed
+  // in parallel.
+  bool log_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<SystemLogUploader> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SystemLogUploader);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_CHROMEOS_POLICY_SYSTEM_LOG_UPLOADER_H_