[Android] Fixes for instrumentation in platform mode.

build/android/pylib/local/device/local_device_test_run.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 logging
 
 from pylib import valgrind_tools
 from pylib.base import base_test_result
 from pylib.base import test_run
 from pylib.base import test_collection
@@ skipping 40 matching lines @@
             run_tests_on_device, tests).pGet(None)
       for try_result in try_results:
         for result in try_result.GetAll():
           if result.GetType() in (base_test_result.ResultType.PASS,
                                   base_test_result.ResultType.SKIP):
             results.AddResult(result)
           else:
             all_fail_results[result.GetName()] = result
 
       results_names = set(r.GetName() for r in results.GetAll())
-      tests = [t for t in tests if t not in results_names]
+      tests = [t for t in tests if self._GetTestName(t) not in results_names]
       tries += 1
 
     all_unknown_test_names = set(tests)
     all_failed_test_names = set(all_fail_results.iterkeys())
 
     unknown_tests = all_unknown_test_names.difference(all_failed_test_names)
     failed_tests = all_failed_test_names.intersection(all_unknown_test_names)
 
     if unknown_tests:
       results.AddResults(
           base_test_result.BaseTestResult(
               t, base_test_result.ResultType.UNKNOWN)
           for t in tests)
     if failed_tests:
       results.AddResults(all_fail_results[f] for f in failed_tests)
     return results
 
   def GetTool(self, device):
     if not str(device) in self._tools:
       self._tools[str(device)] = valgrind_tools.CreateTool(
           self._env.tool, device)
     return self._tools[str(device)]
 
   def _CreateShards(self, tests):
     raise NotImplementedError
 
+  def _GetTestName(self, test):
+    return test
+
   def _GetTests(self):
     raise NotImplementedError
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError