Removed unused code [TestState, OnLaunch]

This CL removes unused code, and does not change the
TestLauncher behavior.

This code was introduced here https://codereview.chromium.org/1806353003
to allow launching unit tests in Mash.

The Mash tests launcher no longer exist, and no other implementation of
PreRunTest exist.

Bug: 936248
Change-Id: Ie7e968d52904b249d57f23dc7c404d477265ed47
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1626023
Commit-Queue: Ilia Samsonov <isamsonov@google.com>
Reviewed-by: Scott Violet <sky@chromium.org>
Reviewed-by: Erik Chen <erikchen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#663778}

base/test/launcher/test_launcher.cc

@@ -401,9 +401,6 @@ int LaunchChildTestProcessWithOptions(const CommandLine& command_line,
     GetLiveProcesses()->insert(std::make_pair(process.Handle(), command_line));
   }
 
-  if (observer)
-    observer->OnLaunched(process.Handle(), process.Pid());
-
   int exit_code = 0;
   bool did_exit = false;
 

base/test/launcher/test_launcher.h

@@ -88,12 +88,6 @@ class ProcessLifetimeObserver {
  public:
   virtual ~ProcessLifetimeObserver() = default;
 
-  // Invoked once the child process is started. |handle| is a handle to the
-  // child process and |id| is its pid. NOTE: this method is invoked on the
-  // thread the process is launched on immediately after it is launched. The
-  // caller owns the ProcessHandle.
-  virtual void OnLaunched(ProcessHandle handle, ProcessId id) {}
-
   // Invoked when a test process exceeds its runtime, immediately before it is
   // terminated. |command_line| is the command line used to launch the process.
   // NOTE: this method is invoked on the thread the process is launched on.

chrome/test/base/interactive_ui_tests_main.cc

@@ -5,6 +5,7 @@
 #include "chrome/test/base/chrome_test_launcher.h"
 
 #include "base/command_line.h"
+#include "base/test/launcher/test_launcher.h"
 #include "build/build_config.h"
 #include "chrome/test/base/chrome_test_suite.h"
 #include "chrome/test/base/in_process_browser_test.h"
@@ -103,14 +104,9 @@ class InteractiveUITestLauncherDelegate : public ChromeTestLauncherDelegate {
   }
 
 #if defined(OS_MACOSX)
-  std::unique_ptr<content::TestState> PreRunTest(
-      base::CommandLine* command_line,
-      base::TestLauncher::LaunchOptions* test_launch_options) override {
-    auto test_state = ChromeTestLauncherDelegate::PreRunTest(
-        command_line, test_launch_options);
+  void PreRunTest() override {
     // Clear currently pressed modifier keys (if any) before the test starts.
     ui_test_utils::ClearKeyEventModifiers();
-    return test_state;
   }
 
   void PostRunTest(base::TestResult* test_result) override {

content/public/test/test_launcher.cc

@@ -158,25 +158,18 @@ class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
         base::TestLauncher* test_launcher,
         std::vector<std::string>&& next_test_names,
         const std::string& test_name,
-        const base::FilePath& output_file,
-        std::unique_ptr<TestState> test_state)
+        const base::FilePath& output_file)
         : base::ProcessLifetimeObserver(),
           test_launcher_delegate_(test_launcher_delegate),
           test_launcher_(test_launcher),
           next_test_names_(std::move(next_test_names)),
           test_name_(test_name),
-          output_file_(output_file),
-          test_state_(std::move(test_state)) {}
+          output_file_(output_file) {}
     ~ChildProcessLifetimeObserver() override {
       DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
     }
 
    private:
-    // base::ProcessLifetimeObserver:
-    void OnLaunched(base::ProcessHandle handle, base::ProcessId id) override {
-      if (test_state_)
-        test_state_->ChildProcessLaunched(handle, id);
-    }
 
     void OnTimedOut(const base::CommandLine& command_line) override {
       test_launcher_delegate_->OnTestTimedOut(command_line);
@@ -188,8 +181,8 @@ class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
                      const std::string& output) override {
       DCHECK_CALLED_ON_VALID_SEQUENCE(sequence_checker_);
       test_launcher_delegate_->GTestCallback(
-          test_launcher_, next_test_names_, test_name_, output_file_,
-          std::move(test_state_), exit_code, elapsed_time, was_timeout, output);
+          test_launcher_, next_test_names_, test_name_, output_file_, exit_code,
+          elapsed_time, was_timeout, output);
     }
 
     SEQUENCE_CHECKER(sequence_checker_);
@@ -198,7 +191,6 @@ class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
     std::vector<std::string> next_test_names_;
     std::string test_name_;
     base::FilePath output_file_;
-    std::unique_ptr<TestState> test_state_;
 
     DISALLOW_COPY_AND_ASSIGN(ChildProcessLifetimeObserver);
   };
@@ -226,7 +218,6 @@ class WrapperTestLauncherDelegate : public base::TestLauncherDelegate {
                      const std::vector<std::string>& test_names,
                      const std::string& test_name,
                      const base::FilePath& output_file,
-                     std::unique_ptr<TestState> test_state,
                      int exit_code,
                      const base::TimeDelta& elapsed_time,
                      bool was_timeout,
@@ -423,11 +414,9 @@ void WrapperTestLauncherDelegate::DoRunTests(
   base::TestLauncher::LaunchOptions test_launch_options;
   test_launch_options.flags = base::TestLauncher::USE_JOB_OBJECTS |
                               base::TestLauncher::ALLOW_BREAKAWAY_FROM_JOB;
-  std::unique_ptr<TestState> test_state_ptr =
-      launcher_delegate_->PreRunTest(&cmd_line, &test_launch_options);
+  launcher_delegate_->PreRunTest();
   CHECK(launcher_delegate_->AdjustChildProcessCommandLine(
             &cmd_line, user_data_dir_map_[test_name_no_pre]));
-
   base::CommandLine new_cmd_line(cmd_line.GetProgram());
   base::CommandLine::SwitchMap switches = cmd_line.GetSwitches();
 
@@ -459,8 +448,7 @@ void WrapperTestLauncherDelegate::DoRunTests(
   char* browser_wrapper = getenv("BROWSER_WRAPPER");
 
   auto observer = std::make_unique<ChildProcessLifetimeObserver>(
-      this, test_launcher, std::move(test_names_copy), test_name, output_file,
-      std::move(test_state_ptr));
+      this, test_launcher, std::move(test_names_copy), test_name, output_file);
   test_launcher->LaunchChildGTestProcess(
       new_cmd_line, browser_wrapper ? browser_wrapper : std::string(),
       TestTimeouts::action_max_timeout(), test_launch_options,
@@ -501,7 +489,6 @@ void WrapperTestLauncherDelegate::GTestCallback(
     const std::vector<std::string>& test_names,
     const std::string& test_name,
     const base::FilePath& output_file,
-    std::unique_ptr<TestState> test_state,
     int exit_code,
     const base::TimeDelta& elapsed_time,
     bool was_timeout,
@@ -589,12 +576,6 @@ const char kSingleProcessTestsFlag[]   = "single_process";
 
 const char kWaitForDebuggerWebUI[] = "wait-for-debugger-webui";
 
-std::unique_ptr<TestState> TestLauncherDelegate::PreRunTest(
-    base::CommandLine* command_line,
-    base::TestLauncher::LaunchOptions* test_launch_options) {
-  return nullptr;
-}
-
 void AppendCommandLineSwitches() {
   base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
 

content/public/test/test_launcher.h

@@ -9,12 +9,12 @@
 #include <string>
 
 #include "base/compiler_specific.h"
-#include "base/test/launcher/test_launcher.h"
 #include "build/build_config.h"
 
 namespace base {
 class CommandLine;
 class FilePath;
+struct TestResult;
 }
 
 namespace content {
@@ -33,17 +33,6 @@ extern const char kWarmupFlag[];
 // Flag used by WebUI test runners to wait for debugger to be attached.
 extern const char kWaitForDebuggerWebUI[];
 
-// See details in PreRunTest().
-class TestState {
- public:
-  virtual ~TestState() {}
-
-  // Called once test process has launched (and is still running).
-  // NOTE: this is called on a background thread.
-  virtual void ChildProcessLaunched(base::ProcessHandle handle,
-                                    base::ProcessId pid) = 0;
-};
-
 class TestLauncherDelegate {
  public:
   virtual int RunTestSuite(int argc, char** argv) = 0;
@@ -56,15 +45,10 @@ class TestLauncherDelegate {
   virtual ContentMainDelegate* CreateContentMainDelegate() = 0;
 #endif
 
-  // Called prior to running each test. The delegate may alter the CommandLine
-  // and options used to launch the subprocess. Additionally the client may
-  // return a TestState that is destroyed once the test completes as well as
-  // once the test process is launched.
+  // Called prior to running each test.
   //
   // NOTE: this is not called if --single_process is supplied.
-  virtual std::unique_ptr<TestState> PreRunTest(
-      base::CommandLine* command_line,
-      base::TestLauncher::LaunchOptions* test_launch_options);
+  virtual void PreRunTest() {}
 
   // Called after running each test. Can modify test result.
   //

fuchsia/engine/test/web_engine_test_launcher.cc

@@ -6,6 +6,7 @@
 
 #include "base/fuchsia/fuchsia_logging.h"
 #include "base/message_loop/message_loop.h"
+#include "base/test/launcher/test_launcher.h"
 #include "base/test/test_suite.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/test/test_launcher.h"