Consolidating the mojo NativeRunner functionality.

chrome/test/base/mojo_test_connector.h

Index: chrome/test/base/mojo_test_connector.h
diff --git a/chrome/test/base/mojo_test_connector.h b/chrome/test/base/mojo_test_connector.h
index 6a960784d6b989199e7dbfb462c0f3a4bc37ad51..952df7f27f34beb63c7c1d66a2d6e1e89542a4c8 100644
--- a/chrome/test/base/mojo_test_connector.h
+++ b/chrome/test/base/mojo_test_connector.h
@@ -45,9 +45,10 @@ class MojoTestConnector {
       base::TestLauncher::LaunchOptions* test_launch_options);
 
  private:
-  class NativeRunnerDelegateImpl;
+  class ServiceProcessLauncherDelegateImpl;
 
-  std::unique_ptr<NativeRunnerDelegateImpl> native_runner_delegate_;
+  std::unique_ptr<ServiceProcessLauncherDelegateImpl>
+      service_process_launcher_delegate_;
 
   service_manager::BackgroundServiceManager background_service_manager_;