Added anonymizer to SystemLogUploader.

chrome/browser/chromeos/policy/system_log_uploader_unittest.cc

Index: chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
diff --git a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
index e30311cb60c1bae8e3bf17caab2bd36b3cf7d610..6f62d403bdc3a03a1305dfbe474f1a2b85db19d2 100644
--- a/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
+++ b/chrome/browser/chromeos/policy/system_log_uploader_unittest.cc
@@ -10,6 +10,7 @@
 #include "base/test/test_simple_task_runner.h"
 #include "base/time/time.h"
 #include "chrome/browser/chromeos/settings/scoped_cros_settings_test_helper.h"
+#include "components/feedback/anonymizer_tool.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "content/public/test/test_utils.h"
 #include "net/http/http_request_headers.h"
@@ -288,23 +289,31 @@ TEST_F(SystemLogUploaderTest, DisableLogUpload) {
 
 // Test RemovePII function.
 TEST_F(SystemLogUploaderTest, TestPII) {
+  feedback::AnonymizerTool anonymizer;
   std::string data =
-      "aaaaaaaaSSID=123aaaaaaaaaaa\n"     // SSID.
+      "aaaaaaaa SSID='123aaaaaa'aaaaa\n"  // SSID.
       "aaaaaaaahttp://tets.comaaaaaaa\n"  // URL.
       "aaaaaemail@example.comaaa\n"       //  Email address.
-      "example@@1234\n"          //  No PII, it is not valid email address.
-      "255.255.355.255\n"        // No PII, it is not valid IP address format.
-      "aaaa123.123.45.4aaa\n"    // IP address.
-      "11:11;11::11\n"           // IP address.
-      "11::11\n"                 // IP address.
-      "11:11:abcdef:0:0:0:0:0";  // No PII, it is not valid IP address format.
+      "example@@1234\n"           //  No PII, it is not valid email address.
+      "255.255.155.255\n"         // IP address.
+      "aaaa123.123.45.4aaa\n"     // IP address.
+      "11:11;11::11\n"            // IP address.
+      "11::11\n"                  // IP address.
+      "11:11:abcdef:0:0:0:0:0\n"  // No PII.
+      "aa:aa:aa:aa:aa:aa";        // MAC address (BSSID).
 
   std::string result =
+      "aaaaaaaa SSID='1'aaaaa\n"

[Andrew T Wilson (Slow), 2016/01/25 11:06:42]

Are we OK that apparently we don't anonymize strings of the form SSID=1234 any
more (only SSID='1234')?

[Polina Bondarenko, 2016/01/25 15:08:34]

I think, it's OK. AnonymizerTool covers more cases than the previous
implementation.
Fixed unit test to check [SSID=1234], because it mostly fits the case of
/var/log/net.log

[Thiemo Nagel, 2016/01/26 15:49:24]

Is the new code not a superset of the old functionality?

Could you please include "SSID 'sensitive_wifi'" (real example from CrOS logs,
without quotes) in the unit test?

[Polina Bondarenko, 2016/01/26 16:42:52]

Yes, it is. Thiemo, do you think that we should cover all use cases here? These
cases are covered in anonymizer_tool_unittests.cc 

+      "aaaaaaaa<URL: 1>\n"
+      "<email: 1>\n"
       "example@@1234\n"
-      "255.255.355.255\n"
-      "11:11:abcdef:0:0:0:0:0\n";
-
-  EXPECT_EQ(result, SystemLogUploader::RemoveSensitiveData(data));
+      "<IPv4: 1>55\n"
+      "aaaa<IPv4: 2>aaa\n"
+      "11:11;<IPv6: 1>\n"
+      "<IPv6: 1>\n"
+      "11:11:abcdef:0:0:0:0:0\n"
+      "aa:aa:aa:00:00:01";
+  EXPECT_EQ(result, SystemLogUploader::RemoveSensitiveData(anonymizer, data));
 }
 
 }  // namespace policy