Added anonymizer to SystemLogUploader.

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 "base/macros.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/memory/scoped_ptr.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"
+#include "components/feedback/anonymizer_tool.h"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
 namespace policy {
 
 // Class responsible for periodically uploading system logs, it handles the
 // server responses by UploadJob:Delegate callbacks.
 class SystemLogUploader : public UploadJob::Delegate {
@@ skipping 42 matching lines @@
   // Returns the time of the last upload attempt, or Time(0) if no upload has
   // ever happened.
   base::Time last_upload_attempt() const { return last_upload_attempt_; }
 
   // UploadJob::Delegate:
   // Callbacks handle success and failure results of upload, destroy the
   // upload job.
   void OnSuccess() override;
   void OnFailure(UploadJob::ErrorCode error_code) override;
 
-  // Remove lines from |data| that contain common PII (IP addresses, SSIDs, URLs
-  // e-mail addresses).
-  static std::string RemoveSensitiveData(const std::string& data);
+  // Remove lines from |data| that contain common PII (IP addresses, SSIDs,
+  // BSSIDs, URLs, e-mail addresses).
+  std::string RemoveSensitiveData(const std::string& data);

[Thiemo Nagel, 2016/01/21 14:22:29]

I think this should be a private method.

[Polina Bondarenko, 2016/01/21 16:16:08]

Thinking about this, I decided to remove this method at all and make all
anonymization inside ReadFiles (see code in .cc file)

 
  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.
@@ skipping 25 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.
   scoped_ptr<chromeos::CrosSettings::ObserverSubscription>
       upload_enabled_observer_;
 
   base::ThreadChecker thread_checker_;
 
+  feedback::AnonymizerTool anonymizer_;

[Thiemo Nagel, 2016/01/21 14:22:29]

I'd suggest to let the AnonymizerTool live as a local variable in ReadFiles(). 
That way, it's internal state is cleared before every upload so that its address
re-numbering scheme is predictable.  (Otherwise re-numbering would depend on
whether the device was rebooted or not.)

[Polina Bondarenko, 2016/01/21 16:16:08]

Done.

+
   // 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_