[Android] Ensure test names are unique during retry determination.

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 fnmatch
 import functools
 import imp
 import logging
 
 from devil import base_error
@@ skipping 144 matching lines @@
     all_test_results = {r.GetName(): r for r in try_results.GetAll()}
 
     def should_retry(name):
       # When specifying a test filter, names can contain trailing wildcards.
       # See local_device_gtest_run._ExtractTestsFromFilter()
       if name.endswith('*'):
         return any(fnmatch.fnmatch(n, name) and is_failure(t)
                    for n, t in all_test_results.iteritems())
       return is_failure(all_test_results.get(name))
 
-    return [t for t in tests if should_retry(self._GetTestName(t))]
+    return [t for t in tests if should_retry(self._GetUniqueTestName(t))]
 
   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
 
   # pylint: disable=no-self-use
-  def _GetTestName(self, test):
+  def _GetUniqueTestName(self, test):
     return test
 
   def _GetTests(self):
     raise NotImplementedError
 
   def _RunTest(self, device, test):
     raise NotImplementedError
 
   def _ShouldShard(self):
     raise NotImplementedError