Revert of [devil] Extract logging common behavior to its own module.

devil/devil/utils/run_tests_helper.py

Index: devil/devil/utils/run_tests_helper.py
diff --git a/devil/devil/utils/run_tests_helper.py b/devil/devil/utils/run_tests_helper.py
index 7f71b65cb4deedc6f4195166a4f69a93710109b6..7c36736a7c181026a013634177aa14e4d6e891d2 100644
--- a/devil/devil/utils/run_tests_helper.py
+++ b/devil/devil/utils/run_tests_helper.py
@@ -4,17 +4,30 @@
 
 """Helper functions common to native, java and host-driven test runners."""
 
-import collections
 import logging
-
-from devil.utils import logging_common
+import sys
+import time
 
 
-CustomFormatter = logging_common.CustomFormatter
+class CustomFormatter(logging.Formatter):
+  """Custom log formatter."""
 
+  # override
+  def __init__(self, fmt='%(threadName)-4s  %(message)s'):
+    # Can't use super() because in older Python versions logging.Formatter does
+    # not inherit from object.
+    logging.Formatter.__init__(self, fmt=fmt)
+    self._creation_time = time.time()
 
-_WrappedLoggingArgs = collections.namedtuple(
-    '_WrappedLoggingArgs', ['verbose'])
+  # override
+  def format(self, record):
+    # Can't use super() because in older Python versions logging.Formatter does
+    # not inherit from object.
+    msg = logging.Formatter.format(self, record)
+    if 'MainThread' in msg[:19]:
+      msg = msg.replace('MainThread', 'Main', 1)
+    timediff = time.time() - self._creation_time
+    return '%s %8.3fs %s' % (record.levelname[0], timediff, msg)
 
 
 def SetLogLevel(verbose_count, add_handler=True):
@@ -24,6 +37,14 @@
     verbose_count: Verbosity level.
     add_handler: If true, adds a handler with |CustomFormatter|.
   """
-  logging_common.InitializeLogging(
-      _WrappedLoggingArgs(verbose_count),
-      handler=None if add_handler else logging.NullHandler())
+  log_level = logging.WARNING  # Default.
+  if verbose_count == 1:
+    log_level = logging.INFO
+  elif verbose_count >= 2:
+    log_level = logging.DEBUG
+  logger = logging.getLogger()
+  logger.setLevel(log_level)
+  if add_handler:
+    custom_handler = logging.StreamHandler(sys.stdout)
+    custom_handler.setFormatter(CustomFormatter())
+    logging.getLogger().addHandler(custom_handler)