[android] Change the recommended log tag format to "cr_foo"

PRESUBMIT_test.py

Index: PRESUBMIT_test.py
diff --git a/PRESUBMIT_test.py b/PRESUBMIT_test.py
index a864f1fcf683901250a99c94b9b8a2711c3df15c..4d40d8f9712239289a44046608b0f4c8d04e9cf8 100755
--- a/PRESUBMIT_test.py
+++ b/PRESUBMIT_test.py
@@ -463,7 +463,7 @@ class CheckAddedDepsHaveTetsApprovalsTest(unittest.TestCase):
       '"+chrome/plugin/chrome_content_plugin_client.h",',
       '"+chrome/utility/chrome_content_utility_client.h",',
       '"+chromeos/chromeos_paths.h",',
-      '"+components/crash",',
+      '"+components/crash/content",',
       '"+components/nacl/common",',
       '"+content/public/browser/render_process_host.h",',
       '"+jni/fooblat.h",',
@@ -840,32 +840,38 @@ class LogUsageTest(unittest.TestCase):
       ]),
       MockAffectedFile('IsInBasePackage.java', [
         'package org.chromium.base;',
-        'private static final String TAG = "cr.Foo";',
+        'private static final String TAG = "cr_Foo";',
         'Log.d(TAG, "foo");',
       ]),
       MockAffectedFile('IsInBasePackageButImportsLog.java', [
         'package org.chromium.base;',
         'import android.util.Log;',
-        'private static final String TAG = "cr.Foo";',
+        'private static final String TAG = "cr_Foo";',
         'Log.d(TAG, "foo");',
       ]),
       MockAffectedFile('HasBothLog.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'private static final String TAG = "cr.Foo";',
+        'private static final String TAG = "cr_Foo";',
         'Log.d(TAG, "foo");',
         'android.util.Log.d("TAG", "foo");',
       ]),
       MockAffectedFile('HasCorrectTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
+        'private static final String TAG = "cr_Foo";',
+        'Log.d(TAG, "foo");',
+      ]),
+      MockAffectedFile('HasOldTag.java', [
+        'import org.chromium.base.Log;',
+        'some random stuff',
         'private static final String TAG = "cr.Foo";',
         'Log.d(TAG, "foo");',
       ]),
-      MockAffectedFile('HasShortCorrectTag.java', [
+      MockAffectedFile('HasDottedTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'private static final String TAG = "cr";',
+        'private static final String TAG = "cr_foo.bar";',
         'Log.d(TAG, "foo");',
       ]),
       MockAffectedFile('HasNoTagDecl.java', [
@@ -875,17 +881,17 @@ class LogUsageTest(unittest.TestCase):
       ]),
       MockAffectedFile('HasIncorrectTagDecl.java', [
         'import org.chromium.base.Log;',
-        'private static final String TAHG = "cr.Foo";',
+        'private static final String TAHG = "cr_Foo";',
         'some random stuff',
         'Log.d(TAG, "foo");',
       ]),
       MockAffectedFile('HasInlineTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'private static final String TAG = "cr.Foo";',
+        'private static final String TAG = "cr_Foo";',
         'Log.d("TAG", "foo");',
       ]),
-      MockAffectedFile('HasIncorrectTag.java', [
+      MockAffectedFile('HasUnprefixedTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
         'private static final String TAG = "rubbish";',
@@ -894,7 +900,7 @@ class LogUsageTest(unittest.TestCase):
       MockAffectedFile('HasTooLongTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'private static final String TAG = "cr.24_charachers_long___";',
+        'private static final String TAG = "21_charachers_long___";',
         'Log.d(TAG, "foo");',
       ]),
     ]
@@ -902,27 +908,42 @@ class LogUsageTest(unittest.TestCase):
     msgs = PRESUBMIT._CheckAndroidCrLogUsage(
         mock_input_api, mock_output_api)
 
-    self.assertEqual(4, len(msgs))
+    self.assertEqual(5, len(msgs),
+                     'Expected %d items, found %d: %s' % (5, len(msgs), msgs))
 
     # Declaration format
-    self.assertEqual(3, len(msgs[0].items))
+    nb = len(msgs[0].items)
+    self.assertEqual(2, nb,
+                     'Expected %d items, found %d: %s' % (2, nb, msgs[0].items))
     self.assertTrue('HasNoTagDecl.java' in msgs[0].items)
     self.assertTrue('HasIncorrectTagDecl.java' in msgs[0].items)
-    self.assertTrue('HasIncorrectTag.java' in msgs[0].items)
 
     # Tag length
-    self.assertEqual(1, len(msgs[1].items))
+    nb = len(msgs[1].items)
+    self.assertEqual(1, nb,
+                     'Expected %d items, found %d: %s' % (1, nb, msgs[1].items))
     self.assertTrue('HasTooLongTag.java' in msgs[1].items)
 
     # Tag must be a variable named TAG
-    self.assertEqual(1, len(msgs[2].items))
+    nb = len(msgs[2].items)
+    self.assertEqual(1, nb,
+                     'Expected %d items, found %d: %s' % (1, nb, msgs[2].items))
     self.assertTrue('HasInlineTag.java:4' in msgs[2].items)
 
     # Util Log usage
-    self.assertEqual(2, len(msgs[3].items))
+    nb = len(msgs[3].items)
+    self.assertEqual(2, nb,
+                     'Expected %d items, found %d: %s' % (2, nb, msgs[3].items))
     self.assertTrue('HasAndroidLog.java:3' in msgs[3].items)
     self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[3].items)
 
+    # Tag must not contain
+    nb = len(msgs[4].items)
+    self.assertEqual(2, nb,
+                     'Expected %d items, found %d: %s' % (2, nb, msgs[4].items))
+    self.assertTrue('HasDottedTag.java' in msgs[4].items)
+    self.assertTrue('HasOldTag.java' in msgs[4].items)
+
 
 if __name__ == '__main__':
   unittest.main()