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"
 
 namespace base {
 class SequencedTaskRunner;
 }
 
+namespace feedback {
+class AnonymizerTool;
+}
+
 namespace policy {
 
 // Class responsible for periodically uploading system logs, it handles the
 // server responses by UploadJob:Delegate callbacks.
 class SystemLogUploader : public UploadJob::Delegate {
  public:
   // Structure that stores the system log files as pairs: (file name, loaded
   // from the disk binary file data).
   typedef std::vector<std::pair<std::string, std::string>> SystemLogs;
 
@@ skipping 37 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, BSSIDs,
+  // SSIDs, URLs, e-mail addresses).
+  static std::string RemoveSensitiveData(
+      feedback::AnonymizerTool* const anonymizer,

[jochen (gone - plz use gerrit), 2016/01/26 11:47:39]

can this pointer also be const?

[Polina Bondarenko, 2016/01/26 12:47:30]

No, AnonymizerTool can't be const, it calls non-const method Anonymize() and,
for example, modifies a list of already translated PII data inside the object to
be able to translate IP addresses to <IP 1>, <IP 2>, etc.

+      const std::string& data);
 
  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 35 matching lines @@
   // 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_