Move some testing classes used by chrome to content\renderer, to match what we're doing with other test classes.

BUG=98716
Review URL: http://codereview.chromium.org/8216019

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

6 files changed, 11 insertions, 11 deletions

diff --git a/content/content_tests.gypi b/content/content_tests.gypi
index 45b6210..6c3ffe8 100644
--- a/content/content_tests.gypi
+++ b/content/content_tests.gypi
@@ -55,13 +55,13 @@
         'gpu/gpu_idirect3d9_mock_win.h',
         'renderer/mock_content_renderer_client.cc',
         'renderer/mock_content_renderer_client.h',
-        'renderer/mock_render_process.cc',
-        'renderer/mock_render_process.h',
         'test/browser_test.h',
         'test/browser_test_base.cc',
         'test/browser_test_base.h',
         'test/content_test_suite.cc',
         'test/content_test_suite.h',
+        'test/mock_render_process.cc',
+        'test/mock_render_process.h',
         'test/render_view_fake_resources_test.cc',
         'test/render_view_fake_resources_test.h',
         'test/test_browser_context.cc',
diff --git a/content/renderer/mock_render_process.cc b/content/test/mock_render_process.cc
index 988f474..0bce202 100644
--- a/content/renderer/mock_render_process.cc
+++ b/content/test/mock_render_process.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/renderer/mock_render_process.h"
+#include "content/test/mock_render_process.h"
 
 #include "ui/gfx/rect.h"
 #include "ui/gfx/surface/transport_dib.h"
diff --git a/content/renderer/mock_render_process.h b/content/test/mock_render_process.h
index b74c568..ef4db6c 100644
--- a/content/renderer/mock_render_process.h
+++ b/content/test/mock_render_process.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_RENDERER_MOCK_RENDER_PROCESS_H_
-#define CONTENT_RENDERER_MOCK_RENDER_PROCESS_H_
+#ifndef CONTENT_TEST_MOCK_RENDER_PROCESS_H_
+#define CONTENT_TEST_MOCK_RENDER_PROCESS_H_
 #pragma once
 
 #include "content/renderer/render_process.h"
@@ -28,4 +28,4 @@ class MockRenderProcess : public RenderProcess {
   DISALLOW_COPY_AND_ASSIGN(MockRenderProcess);
 };
 
-#endif  // CONTENT_RENDERER_MOCK_RENDER_PROCESS_H_
+#endif  // CONTENT_TEST_MOCK_RENDER_PROCESS_H_
diff --git a/content/test/render_view_fake_resources_test.cc b/content/test/render_view_fake_resources_test.cc
index 3be34ad..58b8b1c 100644
--- a/content/test/render_view_fake_resources_test.cc
+++ b/content/test/render_view_fake_resources_test.cc
@@ -13,9 +13,9 @@
 #include "content/common/resource_messages.h"
 #include "content/common/resource_response.h"
 #include "content/common/view_messages.h"
-#include "content/renderer/mock_render_process.h"
 #include "content/renderer/render_thread_impl.h"
 #include "content/renderer/render_view_impl.h"
+#include "content/test/mock_render_process.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/upload_data.h"
 #include "net/http/http_response_headers.h"
diff --git a/content/renderer/render_widget_browsertest.cc b/content/test/render_widget_browsertest.cc
index 51b0735..62ccd72 100644
--- a/content/renderer/render_widget_browsertest.cc
+++ b/content/test/render_widget_browsertest.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/renderer/render_widget_browsertest.h"
+#include "content/test/render_widget_browsertest.h"
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
diff --git a/content/renderer/render_widget_browsertest.h b/content/test/render_widget_browsertest.h
index 6fe4e95..c3e0def 100644
--- a/content/renderer/render_widget_browsertest.h
+++ b/content/test/render_widget_browsertest.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_RENDERER_RENDER_WIDGET_BROWSERTEST_H_
-#define CONTENT_RENDERER_RENDER_WIDGET_BROWSERTEST_H_
+#ifndef CONTENT_TEST_RENDER_WIDGET_BROWSERTEST_H_
+#define CONTENT_TEST_RENDER_WIDGET_BROWSERTEST_H_
 #pragma once
 
 #include "base/basictypes.h"
@@ -55,4 +55,4 @@ class RenderWidgetTest : public RenderViewTest {
   void OutputBitmapToFile(const SkBitmap& bitmap, const FilePath& file_path);
 };
 
-#endif  // CONTENT_RENDERER_RENDER_WIDGET_BROWSERTEST_H_
+#endif  // CONTENT_TEST_RENDER_WIDGET_BROWSERTEST_H_