[Android log] Fix presubmit check reports in base package

PRESUBMIT_test.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 import glob
 import json
 import os
 import re
 import subprocess
@@ skipping 803 matching lines @@
     self.assertEqual(
       ('File %s line %d: %s is missing in '
        'tools/metrics/actions/actions.xml. Please run '
        'tools/metrics/actions/extract_actions.py to update.'
        % (file_with_user_action, 1, 'NotInActionsXml')),
       output[0].message)
 
 
 class LogUsageTest(unittest.TestCase):
 
-  def testCheckNoNewUtilLogUsage(self):
+  def testCheckAndroidCrLogUsage(self):
     mock_input_api = MockInputApi()
     mock_output_api = MockOutputApi()
 
     mock_input_api.files = [
       MockAffectedFile('RandomStuff.java', [
         'random stuff'
       ]),
-      MockAffectedFile('HasCrLog.java', [
-        'import org.chromium.base.Log;',
-        'some random stuff',
-        'Log.d("TAG", "foo");',
-      ]),
       MockAffectedFile('HasAndroidLog.java', [
         'import android.util.Log;',
         'some random stuff',
         'Log.d("TAG", "foo");',
       ]),
-      MockAffectedFile('HasExplicitLog.java', [
+      MockAffectedFile('HasExplicitUtilLog.java', [
         'some random stuff',
         'android.util.Log.d("TAG", "foo");',
       ]),
+      MockAffectedFile('IsInBasePackage.java', [
+        'package org.chromium.base;',
+        '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";',
+        'Log.d(TAG, "foo");',
+      ]),
       MockAffectedFile('HasBothLog.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
-        'Log.d("TAG", "foo");',
+        'private static final String TAG = "cr.Foo";',
+        'Log.d(TAG, "foo");',
         'android.util.Log.d("TAG", "foo");',
       ]),
-    ]
-
-    warnings = PRESUBMIT._CheckNoNewUtilLogUsage(
-        mock_input_api, mock_output_api)
-
-    self.assertEqual(1, len(warnings))
-    self.assertEqual(2, len(warnings[0].items))
-    self.assertTrue('HasAndroidLog.java' in warnings[0].items[0])
-    self.assertTrue('HasExplicitLog.java' in warnings[0].items[1])
-
-  def testCheckAndroidCrLogUsage(self):
-    mock_input_api = MockInputApi()
-    mock_output_api = MockOutputApi()
-
-    mock_input_api.files = [
-      MockAffectedFile('RandomStuff.java', [
-        'random stuff'
-      ]),
       MockAffectedFile('HasCorrectTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
         'private static final String TAG = "cr.Foo";',
         'Log.d(TAG, "foo");',
       ]),
       MockAffectedFile('HasShortCorrectTag.java', [
         'import org.chromium.base.Log;',
         'some random stuff',
         'private static final String TAG = "cr";',
@@ skipping 26 matching lines @@
         'import org.chromium.base.Log;',
         'some random stuff',
         'private static final String TAG = "cr.24_charachers_long___";',
         'Log.d(TAG, "foo");',
       ]),
     ]
 
     msgs = PRESUBMIT._CheckAndroidCrLogUsage(
         mock_input_api, mock_output_api)
 
-    self.assertEqual(3, len(msgs))
+    self.assertEqual(4, len(msgs))
 
     # Declaration format
     self.assertEqual(3, len(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))
     self.assertTrue('HasTooLongTag.java' in msgs[1].items)
 
     # Tag must be a variable named TAG
     self.assertEqual(1, len(msgs[2].items))
     self.assertTrue('HasInlineTag.java:4' in msgs[2].items)
 
+    # Util Log usage
+    self.assertEqual(2, len(msgs[3].items))
+    self.assertTrue('HasAndroidLog.java:3' in msgs[3].items)
+    self.assertTrue('IsInBasePackageButImportsLog.java:4' in msgs[3].items)
 
 
 if __name__ == '__main__':
   unittest.main()