Chromium -> Mojo roll.

build/android/pylib/device/logcat_monitor_test.py

 #!/usr/bin/env python
 # 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.
 
 import itertools
 import os
 import sys
 import unittest
 
@@ skipping 32 matching lines @@
     return test_log
 
   def assertIterEqual(self, expected_iter, actual_iter):
     for expected, actual in itertools.izip_longest(expected_iter, actual_iter):
       self.assertIsNotNone(
           expected,
           msg='actual has unexpected elements starting with %s' % str(actual))
       self.assertIsNotNone(
           actual,
           msg='actual is missing elements starting with %s' % str(expected))
-      self.assertEqual(actual.proc_id, expected[0])
-      self.assertEqual(actual.thread_id, expected[1])
-      self.assertEqual(actual.log_level, expected[2])
-      self.assertEqual(actual.component, expected[3])
-      self.assertEqual(actual.message, expected[4])
+      self.assertEqual(actual.group('proc_id'), expected[0])
+      self.assertEqual(actual.group('thread_id'), expected[1])
+      self.assertEqual(actual.group('log_level'), expected[2])
+      self.assertEqual(actual.group('component'), expected[3])
+      self.assertEqual(actual.group('message'), expected[4])
 
     with self.assertRaises(StopIteration):
       next(actual_iter)
     with self.assertRaises(StopIteration):
       next(expected_iter)
 
   def testWaitFor_success(self):
     test_log = self._createTestLog(
         raw_logcat=type(self)._TEST_THREADTIME_LOGCAT_DATA)
     actual_match = test_log.WaitFor(r'.*(fatal|error) logcat monitor.*', None)
@@ skipping 87 matching lines @@
         ('2345', '5432', 'F', 'LogcatMonitorTest',
          'fatal logcat monitor test message 6'),
         ('3456', '6543', 'D', 'LogcatMonitorTest',
          'ignore me'),]
     self.assertIterEqual(iter(expected_results), actual_results)
 
 
 if __name__ == '__main__':
   unittest.main(verbosity=2)