| Index: chrome/browser/chromeos/policy/system_log_uploader.cc
|
| diff --git a/chrome/browser/chromeos/policy/system_log_uploader.cc b/chrome/browser/chromeos/policy/system_log_uploader.cc
|
| index e9460dd628cbc3b1f6598a117e9305bf41cd3dc8..98aad8d615c5452ad229ac09850cc15a79f8d947 100644
|
| --- a/chrome/browser/chromeos/policy/system_log_uploader.cc
|
| +++ b/chrome/browser/chromeos/policy/system_log_uploader.cc
|
| @@ -17,13 +17,6 @@
|
| #include "net/http/http_request_headers.h"
|
|
|
| namespace {
|
| -// Determines the time between log uploads.
|
| -const int64 kDefaultUploadDelayMs = 12 * 60 * 60 * 1000; // 12 hours
|
| -
|
| -// Determines the time, measured from the time of last failed upload,
|
| -// after which the log upload is retried.
|
| -const int64 kErrorUploadDelayMs = 120 * 1000; // 120 seconds
|
| -
|
| // The maximum number of successive retries.
|
| const int kMaxNumRetries = 1;
|
|
|
| @@ -31,18 +24,6 @@ const int kMaxNumRetries = 1;
|
| const char* kSystemLogUploadUrl =
|
| "https://m.google.com/devicemanagement/data/api/upload";
|
|
|
| -// String constant identifying the header field which stores the file type.
|
| -const char* kFileTypeHeaderName = "File-Type";
|
| -
|
| -// String constant signalling that the data segment contains log files.
|
| -const char* const kFileTypeLogFile = "log_file";
|
| -
|
| -// String constant signalling that the segment contains a plain text.
|
| -const char* const kContentTypePlainText = "text/plain";
|
| -
|
| -// Template string constant for populating the name field.
|
| -const char* const kNameFieldTemplate = "file%d";
|
| -
|
| // The file names of the system logs to upload.
|
| // Note: do not add anything to this list without checking for PII in the file.
|
| const char* const kSystemLogFileNames[] = {
|
| @@ -123,6 +104,26 @@ scoped_ptr<policy::UploadJob> SystemLogDelegate::CreateUploadJob(
|
|
|
| namespace policy {
|
|
|
| +// Determines the time between log uploads.
|
| +const int64 SystemLogUploader::kDefaultUploadDelayMs =
|
| + 12 * 60 * 60 * 1000; // 12 hours
|
| +
|
| +// Determines the time, measured from the time of last failed upload,
|
| +// after which the log upload is retried.
|
| +const int64 SystemLogUploader::kErrorUploadDelayMs = 120 * 1000; // 120 seconds
|
| +
|
| +// String constant identifying the header field which stores the file type.
|
| +const char* const SystemLogUploader::kFileTypeHeaderName = "File-Type";
|
| +
|
| +// String constant signalling that the data segment contains log files.
|
| +const char* const SystemLogUploader::kFileTypeLogFile = "log_file";
|
| +
|
| +// String constant signalling that the segment contains a plain text.
|
| +const char* const SystemLogUploader::kContentTypePlainText = "text/plain";
|
| +
|
| +// Template string constant for populating the name field.
|
| +const char* const SystemLogUploader::kNameFieldTemplate = "file%d";
|
| +
|
| SystemLogUploader::SystemLogUploader(
|
| scoped_ptr<Delegate> syslog_delegate,
|
| const scoped_refptr<base::SequencedTaskRunner>& task_runner)
|
|
|