[Android] Refactor browser test execution. (RELAND)

base/android/java/src/org/chromium/base/Log.java

 // Copyright 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.
 
 package org.chromium.base;
 
 import android.text.TextUtils;
 
 import org.chromium.base.annotations.NoSideEffects;
 
@@ skipping 217 matching lines @@
 
     /**
      * Sends an {@link android.util.Log#INFO} log message.
      *
      * @param tag Used to identify the source of a log message.
      * @param messageTemplate The message you would like logged. It is to be specified as a format
      *                        string.
      * @param args Arguments referenced by the format specifiers in the format string. If the last
      *             one is a {@link Throwable}, its trace will be printed.
      */
+    @VisibleForTesting
     public static void i(String tag, String messageTemplate, Object... args) {
         if (Log.isLoggable(tag, Log.INFO)) {
             String message = formatLog(messageTemplate, args);
             Throwable tr = getThrowableToLog(args);
             if (tr != null) {
                 android.util.Log.i(tag, message, tr);
             } else {
                 android.util.Log.i(tag, message);
             }
         }
     }
 
     /**
      * Sends a {@link android.util.Log#WARN} log message.
      *
      * @param tag Used to identify the source of a log message.
      * @param messageTemplate The message you would like logged. It is to be specified as a format
      *                        string.
      * @param args Arguments referenced by the format specifiers in the format string. If the last
      *             one is a {@link Throwable}, its trace will be printed.
      */
+    @VisibleForTesting
     public static void w(String tag, String messageTemplate, Object... args) {
         if (Log.isLoggable(tag, Log.WARN)) {
             String message = formatLog(messageTemplate, args);
             Throwable tr = getThrowableToLog(args);
             if (tr != null) {
                 android.util.Log.w(tag, message, tr);
             } else {
                 android.util.Log.w(tag, message);
             }
         }
     }
 
     /**
      * Sends an {@link android.util.Log#ERROR} log message.
      *
      * @param tag Used to identify the source of a log message.
      * @param messageTemplate The message you would like logged. It is to be specified as a format
      *                        string.
      * @param args Arguments referenced by the format specifiers in the format string. If the last
      *             one is a {@link Throwable}, its trace will be printed.
      */
+    @VisibleForTesting
     public static void e(String tag, String messageTemplate, Object... args) {
         if (Log.isLoggable(tag, Log.ERROR)) {
             String message = formatLog(messageTemplate, args);
             Throwable tr = getThrowableToLog(args);
             if (tr != null) {
                 android.util.Log.e(tag, message, tr);
             } else {
                 android.util.Log.e(tag, message);
             }
         }
     }
 
     /**
      * What a Terrible Failure: Used for conditions that should never happen, and logged at
      * the {@link android.util.Log#ASSERT} level. Depending on the configuration, it might
      * terminate the process.
      *
      * @see android.util.Log#wtf(String, String, Throwable)
      *
      * @param tag Used to identify the source of a log message.
      * @param messageTemplate The message you would like logged. It is to be specified as a format
      *                        string.
      * @param args Arguments referenced by the format specifiers in the format string. If the last
      *             one is a {@link Throwable}, its trace will be printed.
      */
+    @VisibleForTesting
     public static void wtf(String tag, String messageTemplate, Object... args) {
         if (Log.isLoggable(tag, Log.ASSERT)) {
             String message = formatLog(messageTemplate, args);
             Throwable tr = getThrowableToLog(args);
             if (tr != null) {
                 android.util.Log.wtf(tag, message, tr);
             } else {
                 android.util.Log.wtf(tag, message);
             }
         }
@@ skipping 25 matching lines @@
         for (callerStackIndex = 0; callerStackIndex < st.length; callerStackIndex++) {
             if (st[callerStackIndex].getClassName().equals(logClassName)) {
                 callerStackIndex += 4;
                 break;
             }
         }
 
         return st[callerStackIndex].getFileName() + ":" + st[callerStackIndex].getLineNumber();
     }
 }