| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 "chrome/browser/renderer_host/test/test_render_view_host.h" | 5 #include "chrome/browser/renderer_host/test/test_render_view_host.h" |
| 6 | 6 |
| 7 #include "chrome/browser/browser_url_handler.h" | 7 #include "chrome/browser/browser_url_handler.h" |
| 8 #include "chrome/browser/renderer_host/site_instance.h" | 8 #include "chrome/browser/renderer_host/site_instance.h" |
| 9 #include "chrome/browser/renderer_host/test/test_backing_store.h" | 9 #include "chrome/browser/renderer_host/test/test_backing_store.h" |
| 10 #include "chrome/browser/tab_contents/navigation_controller.h" | 10 #include "chrome/browser/tab_contents/navigation_controller.h" |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 | 188 |
| 189 void TestRenderViewHostFactory::set_render_process_host_factory( | 189 void TestRenderViewHostFactory::set_render_process_host_factory( |
| 190 RenderProcessHostFactory* rph_factory) { | 190 RenderProcessHostFactory* rph_factory) { |
| 191 render_process_host_factory_ = rph_factory; | 191 render_process_host_factory_ = rph_factory; |
| 192 } | 192 } |
| 193 | 193 |
| 194 RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost( | 194 RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost( |
| 195 SiteInstance* instance, | 195 SiteInstance* instance, |
| 196 RenderViewHostDelegate* delegate, | 196 RenderViewHostDelegate* delegate, |
| 197 int routing_id, | 197 int routing_id, |
| 198 int64 session_storage_namespace_id) { | 198 SessionStorageNamespace* session_storage) { |
| 199 // See declaration of render_process_host_factory_ below. | 199 // See declaration of render_process_host_factory_ below. |
| 200 instance->set_render_process_host_factory(render_process_host_factory_); | 200 instance->set_render_process_host_factory(render_process_host_factory_); |
| 201 return new TestRenderViewHost(instance, delegate, routing_id); | 201 return new TestRenderViewHost(instance, delegate, routing_id); |
| 202 } | 202 } |
| 203 | 203 |
| 204 RenderViewHostTestHarness::RenderViewHostTestHarness() | 204 RenderViewHostTestHarness::RenderViewHostTestHarness() |
| 205 : rph_factory_(), | 205 : rph_factory_(), |
| 206 rvh_factory_(&rph_factory_), | 206 rvh_factory_(&rph_factory_), |
| 207 contents_(NULL) { | 207 contents_(NULL) { |
| 208 } | 208 } |
| (...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 275 contents_.reset(); | 275 contents_.reset(); |
| 276 | 276 |
| 277 // Make sure that we flush any messages related to TabContents destruction | 277 // Make sure that we flush any messages related to TabContents destruction |
| 278 // before we destroy the profile. | 278 // before we destroy the profile. |
| 279 MessageLoop::current()->RunAllPending(); | 279 MessageLoop::current()->RunAllPending(); |
| 280 | 280 |
| 281 // Release the profile on the UI thread. | 281 // Release the profile on the UI thread. |
| 282 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); | 282 message_loop_.DeleteSoon(FROM_HERE, profile_.release()); |
| 283 message_loop_.RunAllPending(); | 283 message_loop_.RunAllPending(); |
| 284 } | 284 } |
| OLD | NEW |