Move test_web_contents.* from content\browser\web_contents to content\test, since that's where common test code belongs.
Review URL: https://codereview.chromium.org/12314100
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184439 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/content/browser/devtools/devtools_manager_unittest.cc b/content/browser/devtools/devtools_manager_unittest.cc
index 25dc32c..4f8d253 100644
--- a/content/browser/devtools/devtools_manager_unittest.cc
+++ b/content/browser/devtools/devtools_manager_unittest.cc
@@ -7,13 +7,13 @@
#include "content/browser/devtools/devtools_manager_impl.h"
#include "content/browser/devtools/render_view_devtools_agent_host.h"
#include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/common/view_messages.h"
#include "content/public/browser/content_browser_client.h"
#include "content/public/browser/devtools_agent_host.h"
#include "content/public/browser/devtools_client_host.h"
#include "content/public/browser/web_contents_delegate.h"
#include "content/test/test_content_browser_client.h"
+#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
using base::TimeDelta;
diff --git a/content/browser/download/save_package_unittest.cc b/content/browser/download/save_package_unittest.cc
index e925aca8..b5a07ae 100644
--- a/content/browser/download/save_package_unittest.cc
+++ b/content/browser/download/save_package_unittest.cc
@@ -12,8 +12,8 @@
#include "content/browser/browser_thread_impl.h"
#include "content/browser/download/save_package.h"
#include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/test/net/url_request_mock_http_job.h"
+#include "content/test/test_web_contents.h"
#include "googleurl/src/gurl.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/renderer_host/render_view_host_unittest.cc b/content/browser/renderer_host/render_view_host_unittest.cc
index 6e94708..2645f62a 100644
--- a/content/browser/renderer_host/render_view_host_unittest.cc
+++ b/content/browser/renderer_host/render_view_host_unittest.cc
@@ -6,13 +6,13 @@
#include "content/browser/child_process_security_policy_impl.h"
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/web_contents/navigation_controller_impl.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/common/view_messages.h"
#include "content/port/browser/render_view_host_delegate_view.h"
#include "content/public/browser/navigation_entry.h"
#include "content/public/common/bindings_policy.h"
#include "content/public/common/page_transition_types.h"
#include "content/public/test/mock_render_process_host.h"
+#include "content/test/test_web_contents.h"
#include "net/base/net_util.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebDragOperation.h"
#include "webkit/glue/webdropdata.h"
diff --git a/content/browser/renderer_host/test_render_view_host.cc b/content/browser/renderer_host/test_render_view_host.cc
index 6800b5f..c0cd33ac 100644
--- a/content/browser/renderer_host/test_render_view_host.cc
+++ b/content/browser/renderer_host/test_render_view_host.cc
@@ -9,13 +9,13 @@
#include "content/browser/renderer_host/test_backing_store.h"
#include "content/browser/site_instance_impl.h"
#include "content/browser/web_contents/navigation_controller_impl.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/common/view_messages.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_controller.h"
#include "content/public/browser/storage_partition.h"
#include "content/public/common/content_client.h"
#include "content/public/common/password_form.h"
+#include "content/test/test_web_contents.h"
#include "media/base/video_frame.h"
#include "ui/gfx/rect.h"
#include "webkit/dom_storage/dom_storage_types.h"
diff --git a/content/browser/web_contents/navigation_controller_impl_unittest.cc b/content/browser/web_contents/navigation_controller_impl_unittest.cc
index cc0b669..787bd9cf 100644
--- a/content/browser/web_contents/navigation_controller_impl_unittest.cc
+++ b/content/browser/web_contents/navigation_controller_impl_unittest.cc
@@ -23,7 +23,6 @@
#include "content/browser/site_instance_impl.h"
#include "content/browser/web_contents/navigation_controller_impl.h"
#include "content/browser/web_contents/navigation_entry_impl.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/common/view_messages.h"
#include "content/public/browser/navigation_details.h"
@@ -34,6 +33,7 @@
#include "content/public/browser/web_contents_delegate.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_notification_tracker.h"
+#include "content/test/test_web_contents.h"
#include "net/base/net_util.h"
#include "skia/ext/platform_canvas.h"
#include "testing/gtest/include/gtest/gtest.h"
diff --git a/content/browser/web_contents/render_view_host_manager_unittest.cc b/content/browser/web_contents/render_view_host_manager_unittest.cc
index 6a151c3..917410e 100644
--- a/content/browser/web_contents/render_view_host_manager_unittest.cc
+++ b/content/browser/web_contents/render_view_host_manager_unittest.cc
@@ -9,7 +9,6 @@
#include "content/browser/web_contents/navigation_controller_impl.h"
#include "content/browser/web_contents/navigation_entry_impl.h"
#include "content/browser/web_contents/render_view_host_manager.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/browser/webui/web_ui_controller_factory_registry.h"
#include "content/common/view_messages.h"
#include "content/public/browser/notification_details.h"
@@ -25,6 +24,7 @@
#include "content/public/test/test_notification_tracker.h"
#include "content/test/test_content_browser_client.h"
#include "content/test/test_content_client.h"
+#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/glue_serialize.h"
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index 1820d7a..300ff3eb 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -9,7 +9,6 @@
#include "content/browser/site_instance_impl.h"
#include "content/browser/web_contents/interstitial_page_impl.h"
#include "content/browser/web_contents/navigation_entry_impl.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/browser/webui/web_ui_controller_factory_registry.h"
#include "content/common/view_messages.h"
#include "content/public/browser/interstitial_page_delegate.h"
@@ -28,6 +27,7 @@
#include "content/public/test/test_utils.h"
#include "content/test/test_content_browser_client.h"
#include "content/test/test_content_client.h"
+#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
#include "webkit/glue/webkit_glue.h"
diff --git a/content/browser/web_contents/web_drag_dest_mac_unittest.mm b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
index 76fafbd4..43fb8a3 100644
--- a/content/browser/web_contents/web_drag_dest_mac_unittest.mm
+++ b/content/browser/web_contents/web_drag_dest_mac_unittest.mm
@@ -7,8 +7,8 @@
#include "base/sys_string_conversions.h"
#include "base/utf_string_conversions.h"
#include "content/browser/renderer_host/test_render_view_host.h"
-#include "content/browser/web_contents/test_web_contents.h"
#import "content/browser/web_contents/web_drag_dest_mac.h"
+#include "content/test/test_web_contents.h"
#include "testing/gtest/include/gtest/gtest.h"
#import "third_party/mozilla/NSPasteboard+Utils.h"
#import "ui/base/dragdrop/cocoa_dnd_util.h"
diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 089ad0d3..5623b42d 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -97,8 +97,6 @@
'browser/renderer_host/test_backing_store.h',
'browser/renderer_host/test_render_view_host.cc',
'browser/renderer_host/test_render_view_host.h',
- 'browser/web_contents/test_web_contents.cc',
- 'browser/web_contents/test_web_contents.h',
'gpu/gpu_idirect3d9_mock_win.cc',
'gpu/gpu_idirect3d9_mock_win.h',
'test/content_test_suite.cc',
@@ -130,6 +128,8 @@
'test/test_content_client.h',
'test/test_render_view_host_factory.cc',
'test/test_render_view_host_factory.h',
+ 'test/test_web_contents.cc',
+ 'test/test_web_contents.h',
'test/test_web_contents_view.cc',
'test/test_web_contents_view.h',
diff --git a/content/public/test/test_renderer_host.cc b/content/public/test/test_renderer_host.cc
index 09b17fa..193742e 100644
--- a/content/public/test/test_renderer_host.cc
+++ b/content/public/test/test_renderer_host.cc
@@ -9,11 +9,11 @@
#include "content/browser/renderer_host/test_render_view_host.h"
#include "content/browser/site_instance_impl.h"
#include "content/browser/web_contents/navigation_entry_impl.h"
-#include "content/browser/web_contents/test_web_contents.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/mock_render_process_host.h"
#include "content/public/test/test_browser_context.h"
#include "content/test/test_render_view_host_factory.h"
+#include "content/test/test_web_contents.h"
#if defined(OS_WIN)
#include "ui/base/win/scoped_ole_initializer.h"
diff --git a/content/public/test/web_contents_tester.cc b/content/public/test/web_contents_tester.cc
index 4896d4d..3b2ed55 100644
--- a/content/public/test/web_contents_tester.cc
+++ b/content/public/test/web_contents_tester.cc
@@ -4,7 +4,7 @@
#include "content/public/test/web_contents_tester.h"
-#include "content/browser/web_contents/test_web_contents.h"
+#include "content/test/test_web_contents.h"
namespace content {
diff --git a/content/browser/web_contents/test_web_contents.cc b/content/test/test_web_contents.cc
similarity index 98%
rename from content/browser/web_contents/test_web_contents.cc
rename to content/test/test_web_contents.cc
index 8310fa2..e2be4d4 100644
--- a/content/browser/web_contents/test_web_contents.cc
+++ b/content/test/test_web_contents.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/browser/web_contents/test_web_contents.h"
+#include "content/test/test_web_contents.h"
#include <utility>
diff --git a/content/browser/web_contents/test_web_contents.h b/content/test/test_web_contents.h
similarity index 96%
rename from content/browser/web_contents/test_web_contents.h
rename to content/test/test_web_contents.h
index 18345476..5b231ab8 100644
--- a/content/browser/web_contents/test_web_contents.h
+++ b/content/test/test_web_contents.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_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_
-#define CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_
+#ifndef CONTENT_TEST_TEST_WEB_CONTENTS_H_
+#define CONTENT_TEST_TEST_WEB_CONTENTS_H_
#include "content/browser/web_contents/web_contents_impl.h"
#include "content/public/common/page_transition_types.h"
@@ -131,4 +131,4 @@
} // namespace content
-#endif // CONTENT_BROWSER_WEB_CONTENTS_TEST_WEB_CONTENTS_H_
+#endif // CONTENT_TEST_TEST_WEB_CONTENTS_H_
