diff options
| -rw-r--r-- | chrome/chrome_tests.gypi | 4 | ||||
| -rw-r--r-- | chrome/renderer/DEPS | 4 | ||||
| -rw-r--r-- | chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc | 2 | ||||
| -rw-r--r-- | chrome/test/base/render_view_test.cc | 2 | ||||
| -rw-r--r-- | content/content_tests.gypi | 4 | ||||
| -rw-r--r-- | content/test/mock_render_process.cc (renamed from content/renderer/mock_render_process.cc) | 2 | ||||
| -rw-r--r-- | content/test/mock_render_process.h (renamed from content/renderer/mock_render_process.h) | 6 | ||||
| -rw-r--r-- | content/test/render_view_fake_resources_test.cc | 2 | ||||
| -rw-r--r-- | content/test/render_widget_browsertest.cc (renamed from content/renderer/render_widget_browsertest.cc) | 2 | ||||
| -rw-r--r-- | content/test/render_widget_browsertest.h (renamed from content/renderer/render_widget_browsertest.h) | 6 |
10 files changed, 15 insertions, 19 deletions
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi index 0c58a34..5de75e1 100644 --- a/chrome/chrome_tests.gypi +++ b/chrome/chrome_tests.gypi @@ -2524,8 +2524,8 @@ '../content/browser/speech/speech_input_browsertest.cc', '../content/renderer/render_view_browsertest.cc', '../content/renderer/render_view_browsertest_mac.mm', - '../content/renderer/render_widget_browsertest.cc', - '../content/renderer/render_widget_browsertest.h', + '../content/test/render_widget_browsertest.cc', + '../content/test/render_widget_browsertest.h', '../content/test/test_launcher.cc', '../content/test/test_launcher.h', ], diff --git a/chrome/renderer/DEPS b/chrome/renderer/DEPS index 2d1ca62..642e7a4 100644 --- a/chrome/renderer/DEPS +++ b/chrome/renderer/DEPS @@ -1,9 +1,6 @@ include_rules = [ "+chrome/app", # The plugins use the theme library to get the sad plugin bitmap. "+content/public/renderer", - # DO NOT ADD ANY content/renderer includes, we're working on removing these! - "+content/renderer/mock_render_process.h", - "+content/renderer/render_widget_browsertest.h", "+grit", # For generated headers "+media/base", # For initializing media library and media switches. "+ppapi/native_client/src/trusted/plugin/nacl_entry_points.h", # For NaCl registration. @@ -22,4 +19,3 @@ include_rules = [ "+third_party/npapi/bindings", "+third_party/sqlite", ] - diff --git a/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc b/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc index b57a510..3e4275a 100644 --- a/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc +++ b/chrome/renderer/safe_browsing/phishing_thumbnailer_browsertest.cc @@ -4,7 +4,7 @@ #include "base/basictypes.h" #include "chrome/renderer/safe_browsing/phishing_thumbnailer.h" -#include "content/renderer/render_widget_browsertest.h" +#include "content/test/render_widget_browsertest.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebSize.h" diff --git a/chrome/test/base/render_view_test.cc b/chrome/test/base/render_view_test.cc index d4e7c750..60f1507 100644 --- a/chrome/test/base/render_view_test.cc +++ b/chrome/test/base/render_view_test.cc @@ -19,8 +19,8 @@ #include "content/common/native_web_keyboard_event.h" #include "content/common/renderer_preferences.h" #include "content/common/view_messages.h" -#include "content/renderer/mock_render_process.h" #include "content/renderer/renderer_main_platform_delegate.h" +#include "content/test/mock_render_process.h" #include "grit/renderer_resources.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebFrame.h" #include "third_party/WebKit/Source/WebKit/chromium/public/WebInputEvent.h" 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_ |