[Android] Restore filter specs to AdbWrapper.Logcat and LogcatMonitor.

build/android/pylib/device/logcat_monitor.py

 # 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.
 
 # pylint: disable=unused-argument
 
 import collections
 import itertools
 import logging
 import subprocess
 import tempfile
 import time
 import re
 
 from pylib.device import adb_wrapper
 from pylib.device import decorators
 from pylib.device import device_errors
 
 
 class LogcatMonitor(object):
 
   # Format: <DATE> <TIME> <PID> <TID> <LEVEL> <COMPONENT>: <MESSAGE>
   _THREADTIME_RE_FORMAT = r'\S* +\S* +(%s) +(%s) +(%s) +(%s): +(%s)$'
 
-  def __init__(self, adb, clear=True):
+  def __init__(self, adb, clear=True, filter_specs=None):
     """Create a LogcatMonitor instance.
 
     Args:
       adb: An instance of adb_wrapper.AdbWrapper.
       clear: If True, clear the logcat when monitoring starts.
+      filter_specs: An optional list of '<tag>[:priority]' strings.
     """
     if isinstance(adb, adb_wrapper.AdbWrapper):
       self._adb = adb
     else:
       raise ValueError('Unsupported type passed for argument "device"')
     self._clear = clear
+    self._filter_specs = filter_specs
     self._logcat_out = None
     self._logcat_out_file = None
     self._logcat_proc = None
 
   @decorators.WithTimeoutAndRetriesDefaults(10, 0)
   def WaitFor(self, success_regex, failure_regex=None, timeout=None,
               retries=None):
     """Wait for a matching logcat line or until a timeout occurs.
 
     This will attempt to match lines in the logcat against both |success_regex|
@@ skipping 22 matching lines @@
     if isinstance(failure_regex, basestring):
       failure_regex = re.compile(failure_regex)
 
     logging.debug('Waiting %d seconds for "%s"', timeout, success_regex.pattern)
 
     # NOTE This will continue looping until:
     #  - success_regex matches a line, in which case the match object is
     #    returned.
     #  - failure_regex matches a line, in which case None is returned
     #  - the timeout is hit, in which case a CommandTimeoutError is raised.
-    for l in self._adb.Logcat():
+    for l in self._adb.Logcat(filter_specs=self._filter_specs):
       m = success_regex.search(l)
       if m:
         return m
       if failure_regex and failure_regex.search(l):
         return None
 
   def FindAll(self, message_regex, proc_id=None, thread_id=None, log_level=None,
               component=None):
     """Finds all lines in the logcat that match the provided constraints.
 
@@ skipping 44 matching lines @@
       self._adb.Logcat(clear=True)
 
   def __enter__(self):
     """Starts the logcat monitor."""
     self.Start()
     return self
 
   def __exit__(self, exc_type, exc_val, exc_tb):
     """Stops the logcat monitor."""
     pass