Added anonymizer to SystemLogUploader.

chrome/browser/chromeos/policy/system_log_uploader.h

Index: chrome/browser/chromeos/policy/system_log_uploader.h
diff --git a/chrome/browser/chromeos/policy/system_log_uploader.h b/chrome/browser/chromeos/policy/system_log_uploader.h
index 5a3d6243c12737285c12f1ce5d68f0f322f0ea77..66eaf3763dc82dd00b0f4da8f250ad1b99e2ab88 100644
--- a/chrome/browser/chromeos/policy/system_log_uploader.h
+++ b/chrome/browser/chromeos/policy/system_log_uploader.h
@@ -16,6 +16,7 @@
 #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;
@@ -78,9 +79,9 @@ class SystemLogUploader : public UploadJob::Delegate {
   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.
@@ -126,6 +127,8 @@ class SystemLogUploader : public UploadJob::Delegate {
 
   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_;