content: Rename webkit_test_helpers.{cc,h} to blink_test_helpers.{cc,h}

Now that webkit/ is gone, we are preparing ourselves for the merge of
third_party/WebKit into //blink.

BUG=None
BUG=content_shell && content_unittests
R=avi@chromium.org

Review URL: https://codereview.chromium.org/1118183003

Cr-Commit-Position: refs/heads/master@{#328202}

11 files changed, 14 insertions, 15 deletions

diff --git a/content/DEPS b/content/DEPS
index 91328cc..5a9805e 100644
--- a/content/DEPS
+++ b/content/DEPS
@@ -113,7 +113,6 @@ include_rules = [
 
   "+storage/browser",
   "+storage/common",
-  "+webkit",
 
   # For generated JNI includes.
   "+jni",
diff --git a/content/content_shell.gypi b/content/content_shell.gypi
index c637039..deb473f 100644
--- a/content/content_shell.gypi
+++ b/content/content_shell.gypi
@@ -203,10 +203,10 @@
         'shell/common/test_runner/test_preferences.h',
         'shell/common/v8_breakpad_support_win.cc',
         'shell/common/v8_breakpad_support_win.h',
-        'shell/common/webkit_test_helpers.cc',
-        'shell/common/webkit_test_helpers.h',
         'shell/renderer/ipc_echo.cc',
         'shell/renderer/ipc_echo.h',
+        'shell/renderer/layout_test/blink_test_helpers.cc',
+        'shell/renderer/layout_test/blink_test_helpers.h',
         'shell/renderer/layout_test/blink_test_runner.cc',
         'shell/renderer/layout_test/blink_test_runner.h',
         'shell/renderer/layout_test/gc_controller.cc',
diff --git a/content/shell/BUILD.gn b/content/shell/BUILD.gn
index a838ab8..9f4e0a8 100644
--- a/content/shell/BUILD.gn
+++ b/content/shell/BUILD.gn
@@ -144,10 +144,10 @@ static_library("content_shell_lib") {
     "common/shell_test_configuration.h",
     "common/test_runner/test_preferences.cc",
     "common/test_runner/test_preferences.h",
-    "common/webkit_test_helpers.cc",
-    "common/webkit_test_helpers.h",
     "renderer/ipc_echo.cc",
     "renderer/ipc_echo.h",
+    "renderer/layout_test/blink_test_helpers.cc",
+    "renderer/layout_test/blink_test_helpers.h",
     "renderer/layout_test/blink_test_runner.cc",
     "renderer/layout_test/blink_test_runner.h",
     "renderer/layout_test/gc_controller.cc",
diff --git a/content/shell/browser/layout_test/layout_test_browser_main.cc b/content/shell/browser/layout_test/layout_test_browser_main.cc
index a6d90aa..970e0ea 100644
--- a/content/shell/browser/layout_test/layout_test_browser_main.cc
+++ b/content/shell/browser/layout_test/layout_test_browser_main.cc
@@ -21,7 +21,7 @@
 #include "content/shell/browser/shell.h"
 #include "content/shell/browser/webkit_test_controller.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "net/base/filename_util.h"
 
 #if defined(OS_ANDROID)
diff --git a/content/shell/browser/layout_test/layout_test_content_browser_client.cc b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
index b98ce58..9039997 100644
--- a/content/shell/browser/layout_test/layout_test_content_browser_client.cc
+++ b/content/shell/browser/layout_test/layout_test_content_browser_client.cc
@@ -15,7 +15,7 @@
 #include "content/shell/browser/layout_test/layout_test_notification_manager.h"
 #include "content/shell/browser/shell_browser_context.h"
 #include "content/shell/common/shell_messages.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 
 namespace content {
 namespace {
diff --git a/content/shell/browser/shell_content_browser_client.cc b/content/shell/browser/shell_content_browser_client.cc
index fc03843..57974fb 100644
--- a/content/shell/browser/shell_content_browser_client.cc
+++ b/content/shell/browser/shell_content_browser_client.cc
@@ -33,7 +33,7 @@
 #include "content/shell/browser/webkit_test_controller.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "gin/v8_initializer.h"
 #include "net/url_request/url_request_context_getter.h"
 #include "url/gurl.h"
diff --git a/content/shell/browser/webkit_test_controller.cc b/content/shell/browser/webkit_test_controller.cc
index 4c0fd32..1e31b91 100644
--- a/content/shell/browser/webkit_test_controller.cc
+++ b/content/shell/browser/webkit_test_controller.cc
@@ -33,7 +33,7 @@
 #include "content/shell/browser/shell_devtools_frontend.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "ui/gfx/codec/png_codec.h"
 
 namespace content {
diff --git a/content/shell/common/webkit_test_helpers.cc b/content/shell/renderer/layout_test/blink_test_helpers.cc
index 92c93fa..804b1e5 100644
--- a/content/shell/common/webkit_test_helpers.cc
+++ b/content/shell/renderer/layout_test/blink_test_helpers.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 
 #include "base/command_line.h"
 #include "base/files/file_util.h"
diff --git a/content/shell/common/webkit_test_helpers.h b/content/shell/renderer/layout_test/blink_test_helpers.h
index 0e63cf9..3350b92 100644
--- a/content/shell/common/webkit_test_helpers.h
+++ b/content/shell/renderer/layout_test/blink_test_helpers.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 CONTENT_SHELL_COMMON_WEBKIT_TEST_HELPERS_H_
-#define CONTENT_SHELL_COMMON_WEBKIT_TEST_HELPERS_H_
+#ifndef CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_HELPERS_H_
+#define CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_HELPERS_H_
 
 #include <string>
 #include <vector>
@@ -34,4 +34,4 @@ std::vector<std::string> GetSideloadFontFiles();
 
 }  // namespace content
 
-#endif  // CONTENT_SHELL_COMMON_WEBKIT_TEST_HELPERS_H_
+#endif  // CONTENT_SHELL_RENDERER_LAYOUT_TEST_BLINK_TEST_HELPERS_H_
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc
index 6b72789..1881e2d 100644
--- a/content/shell/renderer/layout_test/blink_test_runner.cc
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc
@@ -32,7 +32,7 @@
 #include "content/shell/common/layout_test/layout_test_messages.h"
 #include "content/shell/common/shell_messages.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "content/shell/renderer/layout_test/gc_controller.h"
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"
 #include "content/shell/renderer/layout_test/leak_detector.h"
diff --git a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
index 06603c1..ec8d450 100644
--- a/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
+++ b/content/shell/renderer/layout_test/layout_test_content_renderer_client.cc
@@ -13,7 +13,7 @@
 #include "content/public/renderer/render_view.h"
 #include "content/public/test/layouttest_support.h"
 #include "content/shell/common/shell_switches.h"
-#include "content/shell/common/webkit_test_helpers.h"
+#include "content/shell/renderer/layout_test/blink_test_helpers.h"
 #include "content/shell/renderer/layout_test/blink_test_runner.h"
 #include "content/shell/renderer/layout_test/layout_test_render_frame_observer.h"
 #include "content/shell/renderer/layout_test/layout_test_render_process_observer.h"