Clean up TestLauncherDelegate.

base/test/launcher/test_launcher.cc

Index: base/test/launcher/test_launcher.cc
diff --git a/base/test/launcher/test_launcher.cc b/base/test/launcher/test_launcher.cc
index f9c71e268955b3b4f62bd57d2a38fafca44e6306..f75f41d3fb3e4c802b0a5b342dcc33369abf64d6 100644
--- a/base/test/launcher/test_launcher.cc
+++ b/base/test/launcher/test_launcher.cc
@@ -766,14 +766,11 @@ void TestLauncher::RunTests() {
           continue;
       }
 
-      std::string filtering_test_name =
-          launcher_delegate_->GetTestNameForFiltering(test_case, test_info);
-
       // Skip the test that doesn't match the filter (if given).
       if (!positive_test_filter_.empty()) {
         bool found = false;
         for (size_t k = 0; k < positive_test_filter_.size(); ++k) {
-          if (MatchPattern(filtering_test_name, positive_test_filter_[k])) {
+          if (MatchPattern(test_name, positive_test_filter_[k])) {
             found = true;
             break;
           }
@@ -784,7 +781,7 @@ void TestLauncher::RunTests() {
       }
       bool excluded = false;
       for (size_t k = 0; k < negative_test_filter_.size(); ++k) {
-        if (MatchPattern(filtering_test_name, negative_test_filter_[k])) {
+        if (MatchPattern(test_name, negative_test_filter_[k])) {
           excluded = true;
           break;
         }
@@ -831,7 +828,6 @@ void TestLauncher::RunTestIteration() {
   retry_count_ = 0;
   tests_to_retry_.clear();
   results_tracker_.OnTestIterationStarting();
-  launcher_delegate_->OnTestIterationStarting();
 
   MessageLoop::current()->PostTask(
       FROM_HERE, Bind(&TestLauncher::RunTests, Unretained(this)));