| 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/test/test_web_contents.h" | 5 #include "content/test/test_web_contents.h" | 
| 6 | 6 | 
| 7 #include <utility> | 7 #include <utility> | 
| 8 | 8 | 
| 9 #include "content/browser/browser_url_handler_impl.h" | 9 #include "content/browser/browser_url_handler_impl.h" | 
| 10 #include "content/browser/frame_host/navigation_entry_impl.h" | 10 #include "content/browser/frame_host/navigation_entry_impl.h" | 
| (...skipping 25 matching lines...) Expand all  Loading... | 
| 36   TestWebContents* test_web_contents = new TestWebContents(browser_context); | 36   TestWebContents* test_web_contents = new TestWebContents(browser_context); | 
| 37   test_web_contents->Init(WebContents::CreateParams(browser_context, instance)); | 37   test_web_contents->Init(WebContents::CreateParams(browser_context, instance)); | 
| 38   return test_web_contents; | 38   return test_web_contents; | 
| 39 } | 39 } | 
| 40 | 40 | 
| 41 TestWebContents::~TestWebContents() { | 41 TestWebContents::~TestWebContents() { | 
| 42   EXPECT_FALSE(expect_set_history_length_and_prune_); | 42   EXPECT_FALSE(expect_set_history_length_and_prune_); | 
| 43 } | 43 } | 
| 44 | 44 | 
| 45 RenderViewHost* TestWebContents::GetPendingRenderViewHost() const { | 45 RenderViewHost* TestWebContents::GetPendingRenderViewHost() const { | 
| 46   return render_manager_.pending_render_view_host_; | 46   return GetRenderManager()->pending_render_view_host_; | 
| 47 } | 47 } | 
| 48 | 48 | 
| 49 TestRenderViewHost* TestWebContents::pending_test_rvh() const { | 49 TestRenderViewHost* TestWebContents::pending_test_rvh() const { | 
| 50   return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost()); | 50   return static_cast<TestRenderViewHost*>(GetPendingRenderViewHost()); | 
| 51 } | 51 } | 
| 52 | 52 | 
| 53 void TestWebContents::TestDidNavigate(RenderViewHost* render_view_host, | 53 void TestWebContents::TestDidNavigate(RenderViewHost* render_view_host, | 
| 54                                       int page_id, | 54                                       int page_id, | 
| 55                                       const GURL& url, | 55                                       const GURL& url, | 
| 56                                       PageTransition transition) { | 56                                       PageTransition transition) { | 
| (...skipping 182 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 239 } | 239 } | 
| 240 | 240 | 
| 241 void TestWebContents::ShowCreatedWidget(int route_id, | 241 void TestWebContents::ShowCreatedWidget(int route_id, | 
| 242                                         const gfx::Rect& initial_pos) { | 242                                         const gfx::Rect& initial_pos) { | 
| 243 } | 243 } | 
| 244 | 244 | 
| 245 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { | 245 void TestWebContents::ShowCreatedFullscreenWidget(int route_id) { | 
| 246 } | 246 } | 
| 247 | 247 | 
| 248 }  // namespace content | 248 }  // namespace content | 
| OLD | NEW | 
|---|