[Android] Refactor browser test execution. (RELAND)

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

Index: base/android/java/src/org/chromium/base/Log.java
diff --git a/base/android/java/src/org/chromium/base/Log.java b/base/android/java/src/org/chromium/base/Log.java
index 553923029bd1e0d62286eede83a5bd77d8849716..4a1a00de3b9052c5e273a91455791fa115e6413e 100644
--- a/base/android/java/src/org/chromium/base/Log.java
+++ b/base/android/java/src/org/chromium/base/Log.java
@@ -235,6 +235,7 @@ public class Log {
      * @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);
@@ -256,6 +257,7 @@ public class Log {
      * @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);
@@ -277,6 +279,7 @@ public class Log {
      * @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);
@@ -302,6 +305,7 @@ public class Log {
      * @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);