[Android] Strip 'DISABLED_' test name prefix for gtest

build/android/pylib/gtest/gtest_test_instance.py

 # Copyright 2014 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 HTMLParser
 import logging
 import os
 import re
 import tempfile
 import threading
@@ skipping 120 matching lines @@
   duration = 0
   fallback_result_type = None
   log = []
   result_type = None
   results = []
   test_name = None
 
   def handle_possibly_unknown_test():
     if test_name is not None:
       results.append(base_test_result.BaseTestResult(
-          test_name,
+          TestNameWithoutDisabledPrefix(test_name),
           fallback_result_type or base_test_result.ResultType.UNKNOWN,
           duration, log=('\n'.join(log) if log else '')))
 
   for l in output:
     logging.info(l)
     matcher = _RE_TEST_STATUS.match(l)
     if matcher:
       if matcher.group(1) == 'RUN':
         handle_possibly_unknown_test()
         duration = 0
@@ skipping 16 matching lines @@
       if matcher:
         test_name = matcher.group(1)
         result_type = base_test_result.ResultType.CRASH
         duration = 0 # Don't know.
 
     if log is not None:
       log.append(l)
 
     if result_type and test_name:
       results.append(base_test_result.BaseTestResult(
-          test_name, result_type, duration,
+          TestNameWithoutDisabledPrefix(test_name), result_type, duration,
           log=('\n'.join(log) if log else '')))
       test_name = None
 
   handle_possibly_unknown_test()
 
   return results
 
 
 def ParseGTestXML(xml_content):
   """Parse gtest XML result."""
   results = []
 
   html = HTMLParser.HTMLParser()
 
   # TODO(jbudorick): Unclear how this handles crashes.
   testsuites = xml.etree.ElementTree.fromstring(xml_content)
   for testsuite in testsuites:
     suite_name = testsuite.attrib['name']
     for testcase in testsuite:
       case_name = testcase.attrib['name']
       result_type = base_test_result.ResultType.PASS
       log = []
       for failure in testcase:
         result_type = base_test_result.ResultType.FAIL
         log.append(html.unescape(failure.attrib['message']))
 
       results.append(base_test_result.BaseTestResult(
-          '%s.%s' % (suite_name, case_name),
+          '%s.%s' % (suite_name, TestNameWithoutDisabledPrefix(case_name)),
           result_type,
           int(float(testcase.attrib['time']) * 1000),
           log=('\n'.join(log) if log else '')))
 
   return results
 
 
 def ConvertTestFilterFileIntoGTestFilterArgument(input_lines):
   """Converts test filter file contents into --gtest_filter argument.
 
@@ skipping 268 matching lines @@
             '%s' % l for l in (line.strip() for line in disabled_tests_file)
             if l and not l.startswith('#')]
 
     return '*-%s' % ':'.join(disabled_filter_items)
 
   #override
   def TearDown(self):
     """Do nothing."""
     pass