From 068970d4e8a15c8915c3e3b1df16c71428a20ba5 Mon Sep 17 00:00:00 2001 From: "jam@chromium.org" Date: Tue, 11 Oct 2011 00:05:16 +0000 Subject: 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 --- content/renderer/render_view_impl.h | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'content/renderer/render_view_impl.h') diff --git a/content/renderer/render_view_impl.h b/content/renderer/render_view_impl.h index d204a5f..c8cc69a 100644 --- a/content/renderer/render_view_impl.h +++ b/content/renderer/render_view_impl.h @@ -646,22 +646,23 @@ class RenderViewImpl : public RenderWidget, FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuRemoveTest, RemoveOnChange); FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, NormalCase); FRIEND_TEST_ALL_PREFIXES(ExternalPopupMenuTest, ShowPopupThenNavigate); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, DontIgnoreBackAfterNavEntryLimit); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, ImeComposition); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, InsertCharacters); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, JSBlockSentAfterPageLoad); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, LastCommittedUpdateState); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnHandleKeyboardEvent); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnImeStateChanged); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnNavStateChanged); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnSetTextDirection); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, OnUpdateWebPreferences); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, StaleNavigationsIgnored); - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, UpdateTargetURLWithInvalidURL); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, + DontIgnoreBackAfterNavEntryLimit); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, ImeComposition); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, InsertCharacters); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, JSBlockSentAfterPageLoad); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, LastCommittedUpdateState); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnHandleKeyboardEvent); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnImeStateChanged); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnNavStateChanged); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnSetTextDirection); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, OnUpdateWebPreferences); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, StaleNavigationsIgnored); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, UpdateTargetURLWithInvalidURL); #if defined(OS_MACOSX) FRIEND_TEST_ALL_PREFIXES(RenderViewTest, MacTestCmdUp); #endif - FRIEND_TEST_ALL_PREFIXES(RenderViewTest, SetHistoryLengthAndPrune); + FRIEND_TEST_ALL_PREFIXES(RenderViewImplTest, SetHistoryLengthAndPrune); typedef std::map HostZoomLevels; -- cgit v1.1