#include "content/browser/dom_storage/session_storage_namespace_impl.h"
#include "content/browser/site_instance_impl.h"
#include "content/common/dom_storage/dom_storage_types.h"
+#include "content/common/frame_messages.h"
#include "content/common/view_messages.h"
#include "content/public/browser/browser_context.h"
#include "content/public/browser/navigation_controller.h"
} // namespace
-void InitNavigateParams(ViewHostMsg_FrameNavigate_Params* params,
+void InitNavigateParams(FrameHostMsg_DidCommitProvisionalLoad_Params* params,
int page_id,
const GURL& url,
PageTransition transition) {
void TestRenderWidgetHostView::UnlockMouse() {
}
-#if defined(OS_WIN) && defined(USE_AURA)
+#if defined(OS_WIN)
void TestRenderWidgetHostView::SetParentNativeViewAccessible(
gfx::NativeViewAccessible accessible_parent) {
}
}
void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) {
- SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK);
+ main_render_frame_host_->SendNavigate(page_id, url);
}
void TestRenderViewHost::SendFailedNavigate(int page_id, const GURL& url) {
- SendNavigateWithTransitionAndResponseCode(
- page_id, url, PAGE_TRANSITION_LINK, 500);
+ main_render_frame_host_->SendFailedNavigate(page_id, url);
}
void TestRenderViewHost::SendNavigateWithTransition(
- int page_id, const GURL& url, PageTransition transition) {
- SendNavigateWithTransitionAndResponseCode(page_id, url, transition, 200);
+ int page_id,
+ const GURL& url,
+ PageTransition transition) {
+ main_render_frame_host_->SendNavigateWithTransition(page_id, url, transition);
}
void TestRenderViewHost::SendNavigateWithOriginalRequestURL(
- int page_id, const GURL& url, const GURL& original_request_url) {
- main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
- kFrameId, -1, true, url);
- SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
- original_request_url, 200, 0);
+ int page_id,
+ const GURL& url,
+ const GURL& original_request_url) {
+ main_render_frame_host_->SendNavigateWithOriginalRequestURL(
+ page_id, url, original_request_url);
}
void TestRenderViewHost::SendNavigateWithFile(
- int page_id, const GURL& url, const base::FilePath& file_path) {
- SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK,
- url, 200, &file_path);
+ int page_id,
+ const GURL& url,
+ const base::FilePath& file_path) {
+ main_render_frame_host_->SendNavigateWithFile(page_id, url, file_path);
}
void TestRenderViewHost::SendNavigateWithParams(
- ViewHostMsg_FrameNavigate_Params* params) {
- params->frame_id = kFrameId;
- ViewHostMsg_FrameNavigate msg(1, *params);
- OnNavigate(msg);
+ FrameHostMsg_DidCommitProvisionalLoad_Params* params) {
+ main_render_frame_host_->SendNavigateWithParams(params);
}
void TestRenderViewHost::SendNavigateWithTransitionAndResponseCode(
- int page_id, const GURL& url, PageTransition transition,
+ int page_id,
+ const GURL& url,
+ PageTransition transition,
int response_code) {
- // DidStartProvisionalLoad may delete the pending entry that holds |url|,
- // so we keep a copy of it to use in SendNavigateWithParameters.
- GURL url_copy(url);
- main_render_frame_host()->OnDidStartProvisionalLoadForFrame(
- kFrameId, -1, true, url_copy);
- SendNavigateWithParameters(page_id, url_copy, transition, url_copy,
- response_code, 0);
+ main_render_frame_host_->SendNavigateWithTransitionAndResponseCode(
+ page_id, url, transition, response_code);
}
void TestRenderViewHost::SendNavigateWithParameters(
- int page_id, const GURL& url, PageTransition transition,
- const GURL& original_request_url, int response_code,
+ int page_id,
+ const GURL& url,
+ PageTransition transition,
+ const GURL& original_request_url,
+ int response_code,
const base::FilePath* file_path_for_history_item) {
- ViewHostMsg_FrameNavigate_Params params;
- params.page_id = page_id;
- params.frame_id = kFrameId;
- params.url = url;
- params.referrer = Referrer();
- params.transition = transition;
- params.redirects = std::vector<GURL>();
- params.should_update_history = true;
- params.searchable_form_url = GURL();
- params.searchable_form_encoding = std::string();
- params.security_info = std::string();
- params.gesture = NavigationGestureUser;
- params.contents_mime_type = contents_mime_type_;
- params.is_post = false;
- params.was_within_same_page = false;
- params.http_status_code = response_code;
- params.socket_address.set_host("2001:db8::1");
- params.socket_address.set_port(80);
- params.was_fetched_via_proxy = simulate_fetch_via_proxy_;
- params.history_list_was_cleared = simulate_history_list_was_cleared_;
- params.original_request_url = original_request_url;
-
- params.page_state = PageState::CreateForTesting(
- url,
- false,
- file_path_for_history_item ? "data" : NULL,
- file_path_for_history_item);
- ViewHostMsg_FrameNavigate msg(1, params);
- OnNavigate(msg);
+ main_render_frame_host_->SendNavigateWithParameters(
+ page_id, url, transition, original_request_url, response_code,
+ file_path_for_history_item);
}
void TestRenderViewHost::SendShouldCloseACK(bool proceed) {
void TestRenderViewHost::SetContentsMimeType(const std::string& mime_type) {
contents_mime_type_ = mime_type;
+ main_render_frame_host_->set_contents_mime_type(mime_type);
}
void TestRenderViewHost::SimulateSwapOutACK() {
void TestRenderViewHost::set_simulate_history_list_was_cleared(bool cleared) {
simulate_history_list_was_cleared_ = cleared;
+ main_render_frame_host_->set_simulate_history_list_was_cleared(cleared);
}
RenderViewHostImplTestHarness::RenderViewHostImplTestHarness() {