| OLD | NEW |
| 1 | 1 |
| 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 2 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
| 3 // Use of this source code is governed by a BSD-style license that can be | 3 // Use of this source code is governed by a BSD-style license that can be |
| 4 // found in the LICENSE file. | 4 // found in the LICENSE file. |
| 5 | 5 |
| 6 #include "content/browser/browser_url_handler.h" | 6 #include "content/browser/browser_url_handler.h" |
| 7 #include "content/browser/renderer_host/test_backing_store.h" | 7 #include "content/browser/renderer_host/test_backing_store.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.h" | 9 #include "content/browser/site_instance.h" |
| 10 #include "content/browser/tab_contents/navigation_controller.h" | 10 #include "content/browser/tab_contents/navigation_controller.h" |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 315 TestTabContents* RenderViewHostTestHarness::contents() { | 315 TestTabContents* RenderViewHostTestHarness::contents() { |
| 316 return contents_.get(); | 316 return contents_.get(); |
| 317 } | 317 } |
| 318 | 318 |
| 319 TestRenderViewHost* RenderViewHostTestHarness::rvh() { | 319 TestRenderViewHost* RenderViewHostTestHarness::rvh() { |
| 320 return static_cast<TestRenderViewHost*>(contents()->GetRenderViewHost()); | 320 return static_cast<TestRenderViewHost*>(contents()->GetRenderViewHost()); |
| 321 } | 321 } |
| 322 | 322 |
| 323 TestRenderViewHost* RenderViewHostTestHarness::pending_rvh() { | 323 TestRenderViewHost* RenderViewHostTestHarness::pending_rvh() { |
| 324 return static_cast<TestRenderViewHost*>( | 324 return static_cast<TestRenderViewHost*>( |
| 325 contents()->render_manager_for_testing()->pending_render_view_host()); | 325 contents()->GetRenderManagerForTesting()->pending_render_view_host()); |
| 326 } | 326 } |
| 327 | 327 |
| 328 TestRenderViewHost* RenderViewHostTestHarness::active_rvh() { | 328 TestRenderViewHost* RenderViewHostTestHarness::active_rvh() { |
| 329 return pending_rvh() ? pending_rvh() : rvh(); | 329 return pending_rvh() ? pending_rvh() : rvh(); |
| 330 } | 330 } |
| 331 | 331 |
| 332 content::BrowserContext* RenderViewHostTestHarness::browser_context() { | 332 content::BrowserContext* RenderViewHostTestHarness::browser_context() { |
| 333 return browser_context_.get(); | 333 return browser_context_.get(); |
| 334 } | 334 } |
| 335 | 335 |
| (...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 378 SetContents(NULL); | 378 SetContents(NULL); |
| 379 | 379 |
| 380 // Make sure that we flush any messages related to TabContents destruction | 380 // Make sure that we flush any messages related to TabContents destruction |
| 381 // before we destroy the browser context. | 381 // before we destroy the browser context. |
| 382 MessageLoop::current()->RunAllPending(); | 382 MessageLoop::current()->RunAllPending(); |
| 383 | 383 |
| 384 // Release the browser context on the UI thread. | 384 // Release the browser context on the UI thread. |
| 385 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); | 385 message_loop_.DeleteSoon(FROM_HERE, browser_context_.release()); |
| 386 message_loop_.RunAllPending(); | 386 message_loop_.RunAllPending(); |
| 387 } | 387 } |
| OLD | NEW |