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

content/shell/test_runner/mock_content_settings_client.h

Index: content/shell/test_runner/mock_content_settings_client.h
diff --git a/components/test_runner/mock_content_settings_client.h b/content/shell/test_runner/mock_content_settings_client.h
similarity index 88%
rename from components/test_runner/mock_content_settings_client.h
rename to content/shell/test_runner/mock_content_settings_client.h
index f01440b62f7548b1bc19970ee710ca15572b0e1f..1124a7c87fd00f808c1f7a45630b97e48062d5c9 100644
--- a/components/test_runner/mock_content_settings_client.h
+++ b/content/shell/test_runner/mock_content_settings_client.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_MOCK_CONTENT_SETTINGS_CLIENT_H_
-#define COMPONENTS_TEST_RUNNER_MOCK_CONTENT_SETTINGS_CLIENT_H_
+#ifndef CONTENT_SHELL_TEST_RUNNER_MOCK_CONTENT_SETTINGS_CLIENT_H_
+#define CONTENT_SHELL_TEST_RUNNER_MOCK_CONTENT_SETTINGS_CLIENT_H_
 
 #include "base/macros.h"
 #include "third_party/WebKit/public/web/WebContentSettingsClient.h"
@@ -46,4 +46,4 @@ class MockContentSettingsClient : public blink::WebContentSettingsClient {
 
 }  // namespace test_runner
 
-#endif  // COMPONENTS_TEST_RUNNER_MOCK_CONTENT_SETTINGS_CLIENT_H_
+#endif  // CONTENT_SHELL_TEST_RUNNER_MOCK_CONTENT_SETTINGS_CLIENT_H_