Index: content/browser/renderer_host/test_render_view_host.cc |
=================================================================== |
--- content/browser/renderer_host/test_render_view_host.cc (revision 118703) |
+++ content/browser/renderer_host/test_render_view_host.cc (working copy) |
@@ -6,7 +6,7 @@ |
#include "content/browser/browser_url_handler.h" |
#include "content/browser/renderer_host/test_backing_store.h" |
#include "content/browser/renderer_host/test_render_view_host.h" |
-#include "content/browser/site_instance.h" |
+#include "content/browser/site_instance_impl.h" |
#include "content/browser/tab_contents/navigation_controller_impl.h" |
#include "content/browser/tab_contents/navigation_entry_impl.h" |
#include "content/browser/tab_contents/test_tab_contents.h" |
@@ -67,7 +67,7 @@ |
tab_contents->GetRenderManagerForTesting()->pending_render_view_host()); |
} |
-TestRenderViewHost::TestRenderViewHost(SiteInstance* instance, |
+TestRenderViewHost::TestRenderViewHost(content::SiteInstance* instance, |
RenderViewHostDelegate* delegate, |
int routing_id) |
: RenderViewHost(instance, delegate, routing_id, |
@@ -303,12 +303,13 @@ |
} |
RenderViewHost* TestRenderViewHostFactory::CreateRenderViewHost( |
- SiteInstance* instance, |
+ content::SiteInstance* instance, |
RenderViewHostDelegate* delegate, |
int routing_id, |
SessionStorageNamespace* session_storage) { |
// See declaration of render_process_host_factory_ below. |
- instance->set_render_process_host_factory(render_process_host_factory_); |
+ reinterpret_cast<SiteInstanceImpl*>(instance)-> |
jam
2012/01/24 03:29:33
nit: ditto
ananta
2012/01/24 23:46:26
Done.
|
+ set_render_process_host_factory(render_process_host_factory_); |
return new TestRenderViewHost(instance, delegate, routing_id); |
} |
@@ -366,8 +367,8 @@ |
browser_context_.reset(new TestBrowserContext()); |
// This will be deleted when the TabContents goes away. |
- SiteInstance* instance = |
- SiteInstance::CreateSiteInstance(browser_context_.get()); |
+ content::SiteInstance* instance = |
+ content::SiteInstance::CreateSiteInstance(browser_context_.get()); |
return new TestTabContents(browser_context_.get(), instance); |
} |