OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "content/browser/renderer_host/test_backing_store.h" | 5 #include "content/browser/renderer_host/test_backing_store.h" |
6 #include "content/browser/dom_storage/dom_storage_context_impl.h" | 6 #include "content/browser/dom_storage/dom_storage_context_impl.h" |
7 #include "content/browser/dom_storage/session_storage_namespace_impl.h" | 7 #include "content/browser/dom_storage/session_storage_namespace_impl.h" |
8 #include "content/browser/renderer_host/test_render_view_host.h" | 8 #include "content/browser/renderer_host/test_render_view_host.h" |
9 #include "content/browser/site_instance_impl.h" | 9 #include "content/browser/site_instance_impl.h" |
10 #include "content/browser/web_contents/navigation_controller_impl.h" | 10 #include "content/browser/web_contents/navigation_controller_impl.h" |
(...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
285 bool TestRenderViewHost::IsRenderViewLive() const { | 285 bool TestRenderViewHost::IsRenderViewLive() const { |
286 return render_view_created_; | 286 return render_view_created_; |
287 } | 287 } |
288 | 288 |
289 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { | 289 void TestRenderViewHost::SendNavigate(int page_id, const GURL& url) { |
290 SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK); | 290 SendNavigateWithTransition(page_id, url, PAGE_TRANSITION_LINK); |
291 } | 291 } |
292 | 292 |
293 void TestRenderViewHost::SendNavigateWithTransition( | 293 void TestRenderViewHost::SendNavigateWithTransition( |
294 int page_id, const GURL& url, PageTransition transition) { | 294 int page_id, const GURL& url, PageTransition transition) { |
295 OnMsgDidStartProvisionalLoadForFrame(0, true, GURL(), url); | 295 OnMsgDidStartProvisionalLoadForFrame(0, -1, true, GURL(), url); |
296 SendNavigateWithParameters(page_id, url, transition, url); | 296 SendNavigateWithParameters(page_id, url, transition, url); |
297 } | 297 } |
298 | 298 |
299 void TestRenderViewHost::SendNavigateWithOriginalRequestURL( | 299 void TestRenderViewHost::SendNavigateWithOriginalRequestURL( |
300 int page_id, const GURL& url, const GURL& original_request_url) { | 300 int page_id, const GURL& url, const GURL& original_request_url) { |
301 OnMsgDidStartProvisionalLoadForFrame(0, true, GURL(), url); | 301 OnMsgDidStartProvisionalLoadForFrame(0, -1, true, GURL(), url); |
302 SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, | 302 SendNavigateWithParameters(page_id, url, PAGE_TRANSITION_LINK, |
303 original_request_url); | 303 original_request_url); |
304 } | 304 } |
305 | 305 |
306 void TestRenderViewHost::SendNavigateWithParameters( | 306 void TestRenderViewHost::SendNavigateWithParameters( |
307 int page_id, const GURL& url, PageTransition transition, | 307 int page_id, const GURL& url, PageTransition transition, |
308 const GURL& original_request_url) { | 308 const GURL& original_request_url) { |
309 ViewHostMsg_FrameNavigate_Params params; | 309 ViewHostMsg_FrameNavigate_Params params; |
310 | 310 |
311 params.page_id = page_id; | 311 params.page_id = page_id; |
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
380 | 380 |
381 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { | 381 TestRenderViewHost* RenderViewHostImplTestHarness::active_test_rvh() { |
382 return static_cast<TestRenderViewHost*>(active_rvh()); | 382 return static_cast<TestRenderViewHost*>(active_rvh()); |
383 } | 383 } |
384 | 384 |
385 TestWebContents* RenderViewHostImplTestHarness::contents() { | 385 TestWebContents* RenderViewHostImplTestHarness::contents() { |
386 return static_cast<TestWebContents*>(web_contents()); | 386 return static_cast<TestWebContents*>(web_contents()); |
387 } | 387 } |
388 | 388 |
389 } // namespace content | 389 } // namespace content |
OLD | NEW |