Index: chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc |
diff --git a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc |
index f7c2aa57c6fed7300141ecb1fef3244764852733..e70fe61222702ea071c2e96cbe16a85fedd6dc44 100644 |
--- a/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc |
+++ b/chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc |
@@ -24,6 +24,9 @@ |
#include "chrome/browser/chromeos/policy/remote_commands/device_commands_factory_chromeos.h" |
#include "chrome/browser/chromeos/policy/server_backed_state_keys_broker.h" |
#include "chrome/browser/chromeos/policy/status_uploader.h" |
+#include "chrome/browser/chromeos/policy/system_log_delegate.h" |
+#include "chrome/browser/chromeos/policy/system_log_upload_job.h" |
+#include "chrome/browser/chromeos/policy/system_log_uploader.h" |
#include "chrome/common/pref_names.h" |
#include "chromeos/chromeos_constants.h" |
#include "chromeos/chromeos_switches.h" |
@@ -253,6 +256,7 @@ void DeviceCloudPolicyManagerChromeOS::StartConnection( |
// the monitoring settings and only perform monitoring if it is active. |
if (install_attributes->IsEnterpriseDevice()) { |
CreateStatusUploader(); |
+ CreateSystemLogUploader(); |
heartbeat_scheduler_.reset( |
new HeartbeatScheduler(g_browser_process->gcm_driver(), |
install_attributes->GetDomain(), |
@@ -277,6 +281,7 @@ void DeviceCloudPolicyManagerChromeOS::Unregister( |
void DeviceCloudPolicyManagerChromeOS::Disconnect() { |
status_uploader_.reset(); |
+ syslog_uploader_.reset(); |
heartbeat_scheduler_.reset(); |
core()->Disconnect(); |
@@ -341,4 +346,10 @@ void DeviceCloudPolicyManagerChromeOS::CreateStatusUploader() { |
task_runner_)); |
} |
+void DeviceCloudPolicyManagerChromeOS::CreateSystemLogUploader() { |
+ syslog_uploader_.reset(new SystemLogUploader( |
+ task_runner_, make_scoped_ptr(new SystemLogUploadJob( |
Andrew T Wilson (Slow)
2015/06/29 15:06:08
I don't like having all of these dependencies expo
Polina Bondarenko
2015/07/02 15:28:03
Done, I'd go with 2)
|
+ make_scoped_ptr(new SystemLogDelegate()))))); |
+} |
+ |
} // namespace policy |