diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:29:25 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-11-25 20:29:25 +0000 |
| commit | 0cc75fe16b6e272176ee8db613ceef0990825bcf (patch) | |
| tree | af036eeaa1c057150357618bc558accfcb05010a /content | |
| parent | 72bcfc775d748a460876d7ff04cfacad07b4496b (diff) | |
| download | chromium_src-0cc75fe16b6e272176ee8db613ceef0990825bcf.zip chromium_src-0cc75fe16b6e272176ee8db613ceef0990825bcf.tar.gz chromium_src-0cc75fe16b6e272176ee8db613ceef0990825bcf.tar.bz2 | |
Move render widget host test to content unittests
BUG=90443
TEST=content_unittests
Review URL: http://codereview.chromium.org/8705002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111613 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/mock_content_browser_client.cc | 22 | ||||
| -rw-r--r-- | content/content_tests.gypi | 1 |
2 files changed, 22 insertions, 1 deletions
diff --git a/content/browser/mock_content_browser_client.cc b/content/browser/mock_content_browser_client.cc index b2e5421..0bee69b 100644 --- a/content/browser/mock_content_browser_client.cc +++ b/content/browser/mock_content_browser_client.cc @@ -15,6 +15,16 @@ #include "ui/base/clipboard/clipboard.h" #include "webkit/glue/webpreferences.h" +#if defined(USE_AURA) +#include "content/browser/renderer_host/render_widget_host_view_aura.h" +#elif defined(OS_WIN) +#include "content/browser/renderer_host/render_widget_host_view_win.h" +#elif defined(TOOLKIT_USES_GTK) +#include "content/browser/renderer_host/render_widget_host_view_gtk.h" +#elif defined(OS_MACOSX) +#include "content/browser/renderer_host/render_widget_host_view_mac.h" +#endif + namespace content { MockContentBrowserClient::MockContentBrowserClient() { @@ -30,7 +40,17 @@ BrowserMainParts* MockContentBrowserClient::CreateBrowserMainParts( RenderWidgetHostView* MockContentBrowserClient::CreateViewForWidget( RenderWidgetHost* widget) { - return NULL; +#if defined(USE_AURA) + return new RenderWidgetHostViewAura(widget); +#elif defined(OS_WIN) + return new RenderWidgetHostViewWin(widget); +#elif defined(TOOLKIT_USES_GTK) + return new RenderWidgetHostViewGtk(widget); +#elif defined(OS_MACOSX) + return render_widget_host_view_mac::CreateRenderWidgetHostView(widget); +#else +#error Need to create your platform ViewForWidget here. +#endif } TabContentsView* MockContentBrowserClient::CreateTabContentsView( diff --git a/content/content_tests.gypi b/content/content_tests.gypi index 31dc90c..cade666 100644 --- a/content/content_tests.gypi +++ b/content/content_tests.gypi @@ -206,6 +206,7 @@ 'browser/renderer_host/media/video_capture_host_unittest.cc', 'browser/renderer_host/media/video_capture_manager_unittest.cc', 'browser/renderer_host/render_view_host_unittest.cc', + 'browser/renderer_host/render_widget_host_unittest.cc', 'browser/renderer_host/render_widget_host_view_mac_editcommand_helper_unittest.mm', 'browser/renderer_host/render_widget_host_view_mac_unittest.mm', 'browser/renderer_host/resource_dispatcher_host_unittest.cc', |