Move //components/test_runner back into //content/shell

content/shell/test_runner/test_runner.h

Index: content/shell/test_runner/test_runner.h
diff --git a/components/test_runner/test_runner.h b/content/shell/test_runner/test_runner.h
similarity index 96%
rename from components/test_runner/test_runner.h
rename to content/shell/test_runner/test_runner.h
index 7cb3c7cedc4a9b6862ecd65a6303b30cf8f3f772..dcbb6d99bf15dcf5399ac964af93773ad2368019 100644
--- a/components/test_runner/test_runner.h
+++ b/content/shell/test_runner/test_runner.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
-#define COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
+#ifndef CONTENT_SHELL_TEST_RUNNER_TEST_RUNNER_H_
+#define CONTENT_SHELL_TEST_RUNNER_TEST_RUNNER_H_
 
 #include <stdint.h>
 
@@ -15,9 +15,9 @@
 
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
-#include "components/test_runner/layout_test_runtime_flags.h"
-#include "components/test_runner/test_runner_export.h"
-#include "components/test_runner/web_test_runner.h"
+#include "content/shell/test_runner/layout_test_runtime_flags.h"
+#include "content/shell/test_runner/test_runner_export.h"
+#include "content/shell/test_runner/web_test_runner.h"
 #include "media/midi/midi_service.mojom.h"
 #include "third_party/WebKit/public/platform/WebEffectiveConnectionType.h"
 #include "third_party/WebKit/public/platform/WebImage.h"
@@ -113,7 +113,7 @@ class TestRunner : public WebTestRunner {
   MockWebSpeechRecognizer* getMockWebSpeechRecognizer();
   bool isPrinting() const;
   bool shouldDumpAsCustomText() const;
-  std:: string customDumpText() const;
+  std::string customDumpText() const;
   void ShowDevTools(const std::string& settings,
                     const std::string& frontend_url);
   void ClearDevToolsLocalStorage();
@@ -286,9 +286,12 @@ class TestRunner : public WebTestRunner {
   void SetMockDeviceLight(double value);
   void ResetDeviceLight();
   // Device Motion / Device Orientation related functions
-  void SetMockDeviceMotion(bool has_acceleration_x, double acceleration_x,
-                           bool has_acceleration_y, double acceleration_y,
-                           bool has_acceleration_z, double acceleration_z,
+  void SetMockDeviceMotion(bool has_acceleration_x,
+                           double acceleration_x,
+                           bool has_acceleration_y,
+                           double acceleration_y,
+                           bool has_acceleration_z,
+                           double acceleration_z,
                            bool has_acceleration_including_gravity_x,
                            double acceleration_including_gravity_x,
                            bool has_acceleration_including_gravity_y,
@@ -302,9 +305,12 @@ class TestRunner : public WebTestRunner {
                            bool has_rotation_rate_gamma,
                            double rotation_rate_gamma,
                            double interval);
-  void SetMockDeviceOrientation(bool has_alpha, double alpha,
-                                bool has_beta, double beta,
-                                bool has_gamma, double gamma,
+  void SetMockDeviceOrientation(bool has_alpha,
+                                double alpha,
+                                bool has_beta,
+                                double beta,
+                                bool has_gamma,
+                                double gamma,
                                 bool absolute);
 
   void SetMockScreenOrientation(const std::string& orientation);
@@ -666,4 +672,4 @@ class TestRunner : public WebTestRunner {
 
 }  // namespace test_runner
 
-#endif  // COMPONENTS_TEST_RUNNER_TEST_RUNNER_H_
+#endif  // CONTENT_SHELL_TEST_RUNNER_TEST_RUNNER_H_