Added system log uploader.

chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.cc

 // 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.
 
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/prefs/pref_registry_simple.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/attestation/attestation_policy_observer.h"
 #include "chrome/browser/chromeos/login/enrollment/auto_enrollment_controller.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_store_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_status_collector.h"
 #include "chrome/browser/chromeos/policy/enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/policy/heartbeat_scheduler.h"
 #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"
 #include "chromeos/system/statistics_provider.h"
 #include "components/policy/core/common/cloud/cloud_policy_core.h"
 #include "components/policy/core/common/cloud/cloud_policy_service.h"
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/remote_commands/remote_commands_factory.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/sha2.h"
@@ skipping 209 matching lines @@
   attestation_policy_observer_.reset(
       new chromeos::attestation::AttestationPolicyObserver(client()));
 
   // Enable device reporting and status monitoring for enterprise enrolled
   // devices. We want to create these objects for enrolled devices, even if
   // monitoring is currently inactive, in case monitoring is turned back on in
   // a future policy fetch - the classes themselves track the current state of
   // 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(),
                                install_attributes->GetDeviceId(),
                                task_runner_));
   }
 
   NotifyConnected();
 }
 
 void DeviceCloudPolicyManagerChromeOS::Unregister(
     const UnregisterCallback& callback) {
   if (!service()) {
     LOG(ERROR) << "Tried to unregister but DeviceCloudPolicyManagerChromeOS is "
                << "not connected.";
     callback.Run(false);
     return;
   }
 
   service()->Unregister(callback);
 }
 
 void DeviceCloudPolicyManagerChromeOS::Disconnect() {
   status_uploader_.reset();
+  syslog_uploader_.reset();
   heartbeat_scheduler_.reset();
   core()->Disconnect();
 
   NotifyDisconnected();
 }
 
 void DeviceCloudPolicyManagerChromeOS::OnStateKeysUpdated() {
   if (client() && ForcedReEnrollmentEnabled())
     client()->SetStateKeysToUpload(state_keys_broker_->state_keys());
 }
@@ skipping 44 matching lines @@
   status_uploader_.reset(new StatusUploader(
       client(),
       make_scoped_ptr(new DeviceStatusCollector(
           local_state_, chromeos::system::StatisticsProvider::GetInstance(),
           DeviceStatusCollector::LocationUpdateRequester(),
           DeviceStatusCollector::VolumeInfoFetcher(),
           DeviceStatusCollector::CPUStatisticsFetcher())),
       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 exposed for everyone to have to be
aware of (SystemLogDelegate() and SystemLogUploadJob() really seem like they
should be internal implementation details of SystemLogUploader() and not
something that DeviceCloudPolicyManager should have to know about.

I'd consider one of the following:

1) Move this factory method into SystemLogUploader() (i.e. define a static
Create(task_runner) method). This would let you hide SystemLogDelegate entirely
and make SystemLogUploadJob an interface.

2) Remove these constructor params, and instead define a
CreateSystemLogUploadJob() virtual function on SystemLogUploader() and tests can
subclass/override if they need to inject their own SystemLogUploadJob().

[Polina Bondarenko, 2015/07/02 15:28:03]

Done, I'd go with 2)

+                        make_scoped_ptr(new SystemLogDelegate())))));
+}
+
 }  // namespace policy