Clean up TestLauncherDelegate.

content/public/test/test_launcher.cc

 // Copyright (c) 2012 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 "content/public/test/test_launcher.h"
 
 #include <map>
 #include <string>
 #include <vector>
 
@@ skipping 100 matching lines @@
 // wrapping a lower-level test launcher with content-specific code.
 class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
  public:
   explicit WrapperTestLauncherDelegate(
       content::TestLauncherDelegate* launcher_delegate)
       : launcher_delegate_(launcher_delegate) {
     CHECK(temp_dir_.CreateUniqueTempDir());
   }
 
   // base::TestLauncherDelegate:
-  virtual void OnTestIterationStarting() OVERRIDE;
-  virtual std::string GetTestNameForFiltering(
-      const testing::TestCase* test_case,
-      const testing::TestInfo* test_info) OVERRIDE;
   virtual bool ShouldRunTest(const testing::TestCase* test_case,
                              const testing::TestInfo* test_info) OVERRIDE;
   virtual size_t RunTests(base::TestLauncher* test_launcher,
                           const std::vector<std::string>& test_names) OVERRIDE;
   virtual size_t RetryTests(
       base::TestLauncher* test_launcher,
       const std::vector<std::string>& test_names) OVERRIDE;
 
  private:
   void DoRunTest(base::TestLauncher* test_launcher,
@@ skipping 32 matching lines @@
 
   // Store names of all seen tests to properly handle PRE_ tests.
   std::set<std::string> all_test_names_;
 
   // Temporary directory for user data directories.
   base::ScopedTempDir temp_dir_;
 
   DISALLOW_COPY_AND_ASSIGN(WrapperTestLauncherDelegate);
 };
 
-void WrapperTestLauncherDelegate::OnTestIterationStarting() {
-  dependent_test_map_.clear();
-  user_data_dir_map_.clear();
-}
-
-std::string WrapperTestLauncherDelegate::GetTestNameForFiltering(
-    const testing::TestCase* test_case,
-    const testing::TestInfo* test_info) {
-  return RemoveAnyPrePrefixes(
-      std::string(test_case->name()) + "." + test_info->name());
-}
-
 bool WrapperTestLauncherDelegate::ShouldRunTest(
     const testing::TestCase* test_case,
     const testing::TestInfo* test_info) {
   all_test_names_.insert(
       std::string(test_case->name()) + "." + test_info->name());
 
   if (StartsWithASCII(test_info->name(), kManualTestPrefix, true) &&
       !CommandLine::ForCurrentProcess()->HasSwitch(kRunManualTestsFlag)) {
     return false;
   }
@@ skipping 11 matching lines @@
   size_t dot_pos = full_name.find('.');
   CHECK_NE(dot_pos, std::string::npos);
   std::string test_case_name = full_name.substr(0, dot_pos);
   std::string test_name = full_name.substr(dot_pos + 1);
   return test_case_name + "." + kPreTestPrefix + test_name;
 }
 
 size_t WrapperTestLauncherDelegate::RunTests(
     base::TestLauncher* test_launcher,
     const std::vector<std::string>& test_names) {
+  dependent_test_map_.clear();
+  reverse_dependent_test_map_.clear();
+  user_data_dir_map_.clear();
+
   // Number of additional tests to run because of dependencies.
   size_t additional_tests_to_run_count = 0;
 
   // Compute dependencies of tests to be run.
   for (size_t i = 0; i < test_names.size(); i++) {
     std::string full_name(test_names[i]);
     std::string pre_test_name(GetPreTestName(full_name));
 
     while (ContainsKey(all_test_names_, pre_test_name)) {
       additional_tests_to_run_count++;
@@ skipping 290 matching lines @@
   base::TestLauncher launcher(&delegate, default_jobs);
   bool success = launcher.Run(argc, argv);
   return (success ? 0 : 1);
 }
 
 TestLauncherDelegate* GetCurrentTestLauncherDelegate() {
   return g_launcher_delegate;
 }
 
 }  // namespace content