From aed85a820f0550808b6eee71b796488275b73f8e Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Wed, 14 Jul 2010 20:47:09 +0000 Subject: Moved InitNavigationParams to test_render_view_host so that other test can use it. Added PageTransitionType to argument to make it more general but I can revert this if you think this should not be changed. let me know. BUG=none TEST=none Review URL: http://codereview.chromium.org/2945015 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@52389 0039d316-1c4b-4281-b951-d872f2087c98 --- .../renderer_host/test/test_render_view_host.cc | 18 ++++++++++++++++++ .../renderer_host/test/test_render_view_host.h | 8 ++++++++ .../safe_browsing_blocking_page_unittest.cc | 22 +--------------------- 3 files changed, 27 insertions(+), 21 deletions(-) (limited to 'chrome') diff --git a/chrome/browser/renderer_host/test/test_render_view_host.cc b/chrome/browser/renderer_host/test/test_render_view_host.cc index e1953d1..ac4efda 100644 --- a/chrome/browser/renderer_host/test/test_render_view_host.cc +++ b/chrome/browser/renderer_host/test/test_render_view_host.cc @@ -14,6 +14,24 @@ using webkit_glue::PasswordForm; +void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, + int page_id, + const GURL& url, + PageTransition::Type transition) { + params->page_id = page_id; + params->url = url; + params->referrer = GURL(); + params->transition = transition; + params->redirects = std::vector(); + params->should_update_history = false; + params->searchable_form_url = GURL(); + params->searchable_form_encoding = std::string(); + params->password_form = PasswordForm(); + params->security_info = std::string(); + params->gesture = NavigationGestureUser; + params->is_post = false; +} + TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, RenderViewHostDelegate* delegate, int routing_id) diff --git a/chrome/browser/renderer_host/test/test_render_view_host.h b/chrome/browser/renderer_host/test/test_render_view_host.h index c3c5109..a2b1c99 100644 --- a/chrome/browser/renderer_host/test/test_render_view_host.h +++ b/chrome/browser/renderer_host/test/test_render_view_host.h @@ -16,9 +16,17 @@ #include "chrome/browser/renderer_host/site_instance.h" #include "chrome/browser/tab_contents/navigation_controller.h" #include "chrome/browser/tab_contents/test_tab_contents.h" +#include "chrome/common/render_messages.h" #include "chrome/test/testing_profile.h" #include "testing/gtest/include/gtest/gtest.h" +// Utility function to initialize ViewHostMsg_NavigateParams_Params +// with given |page_id|, |url| and |transition_type|. +void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, + int page_id, + const GURL& url, + PageTransition::Type transition_type); + // This file provides a testing framework for mocking out the RenderProcessHost // layer. It allows you to test RenderViewHost, TabContents, // NavigationController, and other layers above that without running an actual diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc index 6fadf58..660e8dd 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc @@ -7,9 +7,6 @@ #include "chrome/browser/chrome_thread.h" #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/browser/tab_contents/navigation_entry.h" -#include "chrome/common/render_messages.h" - -using webkit_glue::PasswordForm; static const char* kGoogleURL = "http://www.google.com/"; static const char* kGoodURL = "http://www.goodguys.com/"; @@ -17,23 +14,6 @@ static const char* kBadURL = "http://www.badguys.com/"; static const char* kBadURL2 = "http://www.badguys2.com/"; static const char* kBadURL3 = "http://www.badguys3.com/"; -static void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params, - int page_id, - const GURL& url) { - params->page_id = page_id; - params->url = url; - params->referrer = GURL(); - params->transition = PageTransition::TYPED; - params->redirects = std::vector(); - params->should_update_history = false; - params->searchable_form_url = GURL(); - params->searchable_form_encoding = std::string(); - params->password_form = PasswordForm(); - params->security_info = std::string(); - params->gesture = NavigationGestureUser; - params->is_post = false; -} - // A SafeBrowingBlockingPage class that does not create windows. class TestSafeBrowsingBlockingPage : public SafeBrowsingBlockingPage { public: @@ -100,7 +80,7 @@ class SafeBrowsingBlockingPageTest : public RenderViewHostTestHarness, void Navigate(const char* url, int page_id) { ViewHostMsg_FrameNavigate_Params params; - InitNavigateParams(¶ms, page_id, GURL(url)); + InitNavigateParams(¶ms, page_id, GURL(url), PageTransition::TYPED); contents()->TestDidNavigate(contents_->render_view_host(), params); } -- cgit v1.1