diff options
| author | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 00:05:16 +0000 |
|---|---|---|
| committer | jam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-11 00:05:16 +0000 |
| commit | 068970d4e8a15c8915c3e3b1df16c71428a20ba5 (patch) | |
| tree | cdc5e6313d188f3044a603ffc826c0b81da7e1bd /content/renderer/render_view_browsertest_mac.mm | |
| parent | 771c173105e8f68812fb386e278773adee6319ce (diff) | |
| download | chromium_src-068970d4e8a15c8915c3e3b1df16c71428a20ba5.zip chromium_src-068970d4e8a15c8915c3e3b1df16c71428a20ba5.tar.gz chromium_src-068970d4e8a15c8915c3e3b1df16c71428a20ba5.tar.bz2 | |
Don't expose RenderViewImpl to tests which use RenderViewTest through its header. Instead add a few methods to RenderViewTest that Chrome tests need.
BUG=98716
Review URL: http://codereview.chromium.org/8222014
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104826 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/renderer/render_view_browsertest_mac.mm')
| -rw-r--r-- | content/renderer/render_view_browsertest_mac.mm | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/content/renderer/render_view_browsertest_mac.mm b/content/renderer/render_view_browsertest_mac.mm index 1d3459b..8784c2c 100644 --- a/content/renderer/render_view_browsertest_mac.mm +++ b/content/renderer/render_view_browsertest_mac.mm @@ -6,6 +6,7 @@ #include "base/string16.h" #include "chrome/test/base/render_view_test.h" #include "content/common/native_web_keyboard_event.h" +#include "content/renderer/render_view_impl.h" #include "testing/gtest/include/gtest/gtest.h" #include <Cocoa/Cocoa.h> @@ -82,7 +83,9 @@ TEST_F(RenderViewTest, MacTestCmdUp) { WebPreferences prefs; prefs.enable_scroll_animator = false; - view_->OnUpdateWebPreferences(prefs); + + RenderViewImpl* view = static_cast<RenderViewImpl*>(view_); + view->OnUpdateWebPreferences(prefs); const int kMaxOutputCharacters = 1024; string16 output; @@ -93,13 +96,13 @@ TEST_F(RenderViewTest, MacTestCmdUp) { // First test when javascript does not eat keypresses -- should scroll. sprintf(htmlBuffer, kRawHtml, "true"); - view_->set_send_content_state_immediately(true); + view->set_send_content_state_immediately(true); LoadHTML(htmlBuffer); render_thread_.sink().ClearMessages(); const char* kArrowDownScrollDown = "40,false,false,true,false\n1936\np1\n\np2"; - view_->OnSetEditCommandsForNextKeyEvent( + view->OnSetEditCommandsForNextKeyEvent( EditCommands(1, EditCommand("moveToEndOfDocument", ""))); SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown)); ProcessPendingMessages(); @@ -108,7 +111,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { const char* kArrowUpScrollUp = "38,false,false,true,false\n0\np1\n\np2"; - view_->OnSetEditCommandsForNextKeyEvent( + view->OnSetEditCommandsForNextKeyEvent( EditCommands(1, EditCommand("moveToBeginningOfDocument", ""))); SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown)); ProcessPendingMessages(); @@ -118,13 +121,13 @@ TEST_F(RenderViewTest, MacTestCmdUp) { // Now let javascript eat the key events -- no scrolling should happen sprintf(htmlBuffer, kRawHtml, "false"); - view_->set_send_content_state_immediately(true); + view->set_send_content_state_immediately(true); LoadHTML(htmlBuffer); render_thread_.sink().ClearMessages(); const char* kArrowDownNoScroll = "40,false,false,true,false\np1\n\np2"; - view_->OnSetEditCommandsForNextKeyEvent( + view->OnSetEditCommandsForNextKeyEvent( EditCommands(1, EditCommand("moveToEndOfDocument", ""))); SendNativeKeyEvent(NativeWebKeyboardEvent(arrowDownKeyDown)); ProcessPendingMessages(); @@ -133,7 +136,7 @@ TEST_F(RenderViewTest, MacTestCmdUp) { const char* kArrowUpNoScroll = "38,false,false,true,false\np1\n\np2"; - view_->OnSetEditCommandsForNextKeyEvent( + view->OnSetEditCommandsForNextKeyEvent( EditCommands(1, EditCommand("moveToBeginningOfDocument", ""))); SendNativeKeyEvent(NativeWebKeyboardEvent(arrowUpKeyDown)); ProcessPendingMessages(); |