moving mocks into webkit/mocks/

The number of mock_... files in webkit/glue is piling up and it makes more sense for them to live in a brand new mocks/ directory.

BUG=None.
TEST=Compiles.

Review URL: http://codereview.chromium.org/5878006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69562 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 17 insertions, 17 deletions

diff --git a/webkit/glue/media/buffered_data_source_unittest.cc b/webkit/glue/media/buffered_data_source_unittest.cc
index 1e1bb1a..dcb11ec 100644
--- a/webkit/glue/media/buffered_data_source_unittest.cc
+++ b/webkit/glue/media/buffered_data_source_unittest.cc
@@ -11,7 +11,7 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLError.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "webkit/glue/media/buffered_data_source.h"
-#include "webkit/glue/mock_webframe.h"
+#include "webkit/mocks/mock_webframe.h"
 
 using ::testing::_;
 using ::testing::Assign;
diff --git a/webkit/glue/media/buffered_resource_loader_unittest.cc b/webkit/glue/media/buffered_resource_loader_unittest.cc
index db9b49e..8e64c26 100644
--- a/webkit/glue/media/buffered_resource_loader_unittest.cc
+++ b/webkit/glue/media/buffered_resource_loader_unittest.cc
@@ -14,8 +14,8 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebView.h"
 #include "webkit/glue/media/buffered_resource_loader.h"
-#include "webkit/glue/mock_webframe.h"
-#include "webkit/glue/mock_weburlloader_impl.h"
+#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::Assign;
diff --git a/webkit/glue/media/simple_data_source_unittest.cc b/webkit/glue/media/simple_data_source_unittest.cc
index c214949..55dc913 100644
--- a/webkit/glue/media/simple_data_source_unittest.cc
+++ b/webkit/glue/media/simple_data_source_unittest.cc
@@ -13,8 +13,8 @@
 #include "third_party/WebKit/WebKit/chromium/public/WebURLRequest.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebURLResponse.h"
 #include "webkit/glue/media/simple_data_source.h"
-#include "webkit/glue/mock_webframe.h"
-#include "webkit/glue/mock_weburlloader_impl.h"
+#include "webkit/mocks/mock_webframe.h"
+#include "webkit/mocks/mock_weburlloader.h"
 
 using ::testing::_;
 using ::testing::DoAll;
diff --git a/webkit/glue/mock_resource_loader_bridge.h b/webkit/mocks/mock_resource_loader_bridge.h
index 49c41ed..5be7d89 100644
--- a/webkit/glue/mock_resource_loader_bridge.h
+++ b/webkit/mocks/mock_resource_loader_bridge.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 WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
-#define WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#ifndef WEBKIT_MOCKS_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#define WEBKIT_MOCKS_MOCK_RESOURCE_LOADER_BRIDGE_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/glue/resource_loader_bridge.h"
@@ -41,4 +41,4 @@ class MockResourceLoaderBridge : public webkit_glue::ResourceLoaderBridge {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_MOCK_RESOURCE_LOADER_BRIDGE_H_
+#endif  // WEBKIT_MOCKS_MOCK_RESOURCE_LOADER_BRIDGE_H_
diff --git a/webkit/glue/mock_webframe.h b/webkit/mocks/mock_webframe.h
index 9d6c70b..bdf4c58 100644
--- a/webkit/glue/mock_webframe.h
+++ b/webkit/mocks/mock_webframe.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 WEBKIT_GLUE_MOCK_WEBFRAME_H_
-#define WEBKIT_GLUE_MOCK_WEBFRAME_H_
+#ifndef WEBKIT_MOCKS_MOCK_WEBFRAME_H_
+#define WEBKIT_MOCKS_MOCK_WEBFRAME_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebDocument.h"
@@ -349,4 +349,4 @@ class MockWebFrame : public WebKit::WebFrame {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_MOCK_WEBFRAME_H_
+#endif  // WEBKIT_MOCKS_MOCK_WEBFRAME_H_
diff --git a/webkit/glue/mock_weburlloader_impl.h b/webkit/mocks/mock_weburlloader.h
index da50b72..7253faa 100644
--- a/webkit/glue/mock_weburlloader_impl.h
+++ b/webkit/mocks/mock_weburlloader.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 WEBKIT_GLUE_MOCK_WEBURLLOADER_IMPL_H_
-#define WEBKIT_GLUE_MOCK_WEBURLLOADER_IMPL_H_
+#ifndef WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
+#define WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
 
 #include "testing/gmock/include/gmock/gmock.h"
 #include "webkit/glue/weburlloader_impl.h"
@@ -33,4 +33,4 @@ class MockWebURLLoader : public WebKit::WebURLLoader {
 
 }  // namespace webkit_glue
 
-#endif  // WEBKIT_GLUE_MOCK_WEBURLLOADER_IMPL_H_
+#endif  // WEBKIT_MOCKS_MOCK_WEBURLLOADER_H_
diff --git a/webkit/tools/test_shell/test_shell.gypi b/webkit/tools/test_shell/test_shell.gypi
index 0e46321..be9fcab 100644
--- a/webkit/tools/test_shell/test_shell.gypi
+++ b/webkit/tools/test_shell/test_shell.gypi
@@ -399,9 +399,6 @@
         '../../glue/media/buffered_resource_loader_unittest.cc',
         '../../glue/media/simple_data_source_unittest.cc',
         '../../glue/mimetype_unittest.cc',
-        '../../glue/mock_resource_loader_bridge.h',
-        '../../glue/mock_webframe.h',
-        '../../glue/mock_weburlloader_impl.h',
         '../../glue/multipart_response_delegate_unittest.cc',
         '../../glue/plugins/plugin_group_unittest.cc',
         '../../glue/plugins/plugin_lib_unittest.cc',
@@ -415,6 +412,9 @@
         '../../glue/webkit_glue_unittest.cc',
         '../../glue/webpasswordautocompletelistener_unittest.cc',
         '../../glue/webview_unittest.cc',
+        '../../mocks/mock_resource_loader_bridge.h',
+        '../../mocks/mock_webframe.h',
+        '../../mocks/mock_weburlloader.h',
         '../../plugins/ppapi/mock_plugin_delegate.cc',
         '../../plugins/ppapi/mock_plugin_delegate.h',
         '../../plugins/ppapi/mock_resource.h',