9 files changed, 36 insertions, 47 deletions
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index c0cdf28..98f303ae 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -118,6 +118,9 @@
         'test/mock_render_process.h',
         'test/mock_webclipboard_impl.cc',
         'test/mock_webclipboard_impl.h',
+        'test/mock_webframeclient.h',
+        'test/mock_weburlloader.cc',
+        'test/mock_weburlloader.h',
         'test/net/url_request_abort_on_end_job.cc',
         'test/net/url_request_abort_on_end_job.h',
         'test/net/url_request_failed_job.cc',
@@ -588,8 +591,6 @@
         '../webkit/common/database/database_identifier_unittest.cc',
         '../webkit/common/fileapi/file_system_util_unittest.cc',
         '../webkit/glue/webkit_glue_unittest.cc',
-        '../webkit/mocks/mock_weburlloader.cc',
-        '../webkit/mocks/mock_weburlloader.h',
         '../webkit/common/user_agent/user_agent_unittest.cc',
         '../webkit/browser/quota/mock_quota_manager.cc',
         '../webkit/browser/quota/mock_quota_manager.h',
diff --git a/content/renderer/media/android/media_info_loader_unittest.cc b/content/renderer/media/android/media_info_loader_unittest.cc
index 37e41b1..7e47ba5 100644
--- a/content/renderer/media/android/media_info_loader_unittest.cc
+++ b/content/renderer/media/android/media_info_loader_unittest.cc
@@ -5,13 +5,13 @@
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "content/renderer/media/android/media_info_loader.h"
+#include "content/test/mock_webframeclient.h"
+#include "content/test/mock_weburlloader.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebMediaPlayer.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/mocks/mock_webframeclient.h"
-#include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::InSequence;
@@ -22,9 +22,6 @@ using WebKit::WebURLError;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-using webkit_glue::MockWebFrameClient;
-using webkit_glue::MockWebURLLoader;
-
 namespace content {
 
 static const char* kHttpUrl = "http://test";
diff --git a/content/renderer/media/buffered_data_source_unittest.cc b/content/renderer/media/buffered_data_source_unittest.cc
index 11af9eb..911c230 100644
--- a/content/renderer/media/buffered_data_source_unittest.cc
+++ b/content/renderer/media/buffered_data_source_unittest.cc
@@ -6,14 +6,14 @@
 #include "base/message_loop/message_loop.h"
 #include "content/renderer/media/buffered_data_source.h"
 #include "content/renderer/media/test_response_generator.h"
+#include "content/test/mock_webframeclient.h"
+#include "content/test/mock_weburlloader.h"
 #include "media/base/media_log.h"
 #include "media/base/mock_data_source_host.h"
 #include "media/base/mock_filters.h"
 #include "media/base/test_helpers.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/mocks/mock_webframeclient.h"
-#include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::Assign;
@@ -28,9 +28,6 @@ using WebKit::WebURLLoader;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-using webkit_glue::MockWebFrameClient;
-using webkit_glue::MockWebURLLoader;
-
 namespace content {
 
 // Overrides CreateResourceLoader() to permit injecting a MockWebURLLoader.
diff --git a/content/renderer/media/buffered_resource_loader_unittest.cc b/content/renderer/media/buffered_resource_loader_unittest.cc
index a0a63cf..cd8a4b6 100644
--- a/content/renderer/media/buffered_resource_loader_unittest.cc
+++ b/content/renderer/media/buffered_resource_loader_unittest.cc
@@ -10,6 +10,8 @@
 #include "base/message_loop/message_loop.h"
 #include "base/strings/stringprintf.h"
 #include "content/renderer/media/buffered_resource_loader.h"
+#include "content/test/mock_webframeclient.h"
+#include "content/test/mock_weburlloader.h"
 #include "media/base/media_log.h"
 #include "media/base/seekable_buffer.h"
 #include "net/base/net_errors.h"
@@ -21,8 +23,6 @@
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/WebKit/public/web/WebView.h"
-#include "webkit/mocks/mock_webframeclient.h"
-#include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::InSequence;
@@ -35,9 +35,6 @@ using WebKit::WebURLError;
 using WebKit::WebURLResponse;
 using WebKit::WebView;
 
-using webkit_glue::MockWebFrameClient;
-using webkit_glue::MockWebURLLoader;
-
 namespace content {
 
 static const char* kHttpUrl = "http://test";
diff --git a/content/test/mock_webframeclient.h b/content/test/mock_webframeclient.h
new file mode 100644
index 0000000..5683fd6
--- /dev/null
+++ b/content/test/mock_webframeclient.h
@@ -0,0 +1,16 @@
+// Copyright 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#ifndef CONTENT_TEST_MOCK_WEBFRAMECLIENT_H_
+#define CONTENT_TEST_MOCK_WEBFRAMECLIENT_H_
+
+#include "third_party/WebKit/public/web/WebFrameClient.h"
+
+namespace content {
+
+class MockWebFrameClient : public WebKit::WebFrameClient {};
+
+}  // namespace content
+
+#endif  // CONTENT_TEST_MOCK_WEBFRAMECLIENT_H_
diff --git a/webkit/mocks/mock_weburlloader.cc b/content/test/mock_weburlloader.cc
index dc4f2d0..951c587 100644
--- a/webkit/mocks/mock_weburlloader.cc
+++ b/content/test/mock_weburlloader.cc
@@ -1,18 +1,18 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/mocks/mock_weburlloader.h"
+#include "content/test/mock_weburlloader.h"
 
 #include "third_party/WebKit/public/platform/WebData.h"
 #include "third_party/WebKit/public/platform/WebURLError.h"
 #include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/platform/WebURLResponse.h"
 
-namespace webkit_glue {
+namespace content {
 
 MockWebURLLoader::MockWebURLLoader() {}
 
 MockWebURLLoader::~MockWebURLLoader() {}
 
-}  // namespace webkit_glue
+}  // namespace content
diff --git a/webkit/mocks/mock_weburlloader.h b/content/test/mock_weburlloader.h
index a9e2d6b..15698c8 100644
--- a/webkit/mocks/mock_weburlloader.h
+++ b/content/test/mock_weburlloader.h
@@ -1,14 +1,14 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
-#define WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
+#ifndef CONTENT_TEST_MOCK_WEBURLLOADER_H_
+#define CONTENT_TEST_MOCK_WEBURLLOADER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
-#include "webkit/child/weburlloader_impl.h"
+#include "third_party/WebKit/public/platform/WebURLLoader.h"
 
-namespace webkit_glue {
+namespace content {
 
 class MockWebURLLoader : public WebKit::WebURLLoader {
  public:
@@ -28,6 +28,6 @@ class MockWebURLLoader : public WebKit::WebURLLoader {
   DISALLOW_COPY_AND_ASSIGN(MockWebURLLoader);
 };
 
-}  // namespace webkit_glue
+}  // namespace content
 
-#endif  // WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
+#endif  // CONTENT_TEST_MOCK_WEBURLLOADER_H_
diff --git a/webkit/mocks/DEPS b/webkit/mocks/DEPS
deleted file mode 100644
index c3a5b96..0000000
--- a/webkit/mocks/DEPS
+++ /dev/null
@@ -1,3 +0,0 @@
-include_rules = [
-  "+media",
-]
diff --git a/webkit/mocks/mock_webframeclient.h b/webkit/mocks/mock_webframeclient.h
deleted file mode 100644
index c0d7040..0000000
--- a/webkit/mocks/mock_webframeclient.h
+++ /dev/null
@@ -1,16 +0,0 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef WEBKIT_MOCKS_MOCK_WEBFRAMECLIENT_H_
-#define WEBKIT_MOCKS_MOCK_WEBFRAMECLIENT_H_
-
-#include "third_party/WebKit/public/web/WebFrameClient.h"
-
-namespace webkit_glue {
-
-class MockWebFrameClient : public WebKit::WebFrameClient {};
-
-}  // namespace webkit_glue
-
-#endif  // WEBKIT_MOCKS_MOCK_WEBFRAMECLIENT_H_