Clean up TestLauncherDelegate.

base/test/launcher/test_launcher.cc

 // Copyright 2013 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.
 
 #include "base/test/launcher/test_launcher.h"
 
 #if defined(OS_POSIX)
 #include <fcntl.h>
 #endif
 
@@ skipping 748 matching lines @@
 
       const CommandLine* command_line = CommandLine::ForCurrentProcess();
       if (test_name.find("DISABLED") != std::string::npos) {
         results_tracker_.AddDisabledTest(test_name);
 
         // Skip disabled tests unless explicitly requested.
         if (!command_line->HasSwitch(kGTestRunDisabledTestsFlag))
           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;
           }
         }
 
         if (!found)
           continue;
       }
       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;
         }
       }
       if (excluded)
         continue;
 
       if (!launcher_delegate_->ShouldRunTest(test_case, test_info))
         continue;
 
@@ skipping 26 matching lines @@
   // Special value "-1" means "repeat indefinitely".
   cycles_ = (cycles_ == -1) ? cycles_ : cycles_ - 1;
 
   test_started_count_ = 0;
   test_finished_count_ = 0;
   test_success_count_ = 0;
   test_broken_count_ = 0;
   retry_count_ = 0;
   tests_to_retry_.clear();
   results_tracker_.OnTestIterationStarting();
-  launcher_delegate_->OnTestIterationStarting();
 
   MessageLoop::current()->PostTask(
       FROM_HERE, Bind(&TestLauncher::RunTests, Unretained(this)));
 }
 
 void TestLauncher::MaybeSaveSummaryAsJSON() {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   if (command_line->HasSwitch(switches::kTestLauncherSummaryOutput)) {
     FilePath summary_path(command_line->GetSwitchValuePath(
                               switches::kTestLauncherSummaryOutput));
@@ skipping 216 matching lines @@
 
     g_live_processes.Get().erase(process_handle);
   }
 
   base::CloseProcessHandle(process_handle);
 
   return exit_code;
 }
 
 }  // namespace base