Define the public interface for content browser SiteInstance. This interface is implemented by th...

content/browser/renderer_host/test_render_view_host.cc

 
 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "content/common/dom_storage_common.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/common/content_client.h"
 #include "content/test/test_browser_context.h"
 #include "ui/gfx/rect.h"
 #include "webkit/forms/password_form.h"
@@ skipping 40 matching lines @@
 }
 
 TestRenderViewHost* TestRenderViewHost::GetPendingForController(
     content::NavigationController* controller) {
   TabContents* tab_contents = static_cast<TabContents*>(
       controller->GetWebContents());
   return static_cast<TestRenderViewHost*>(
       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,
                      kInvalidSessionStorageNamespaceId),
       render_view_created_(false),
       delete_counter_(NULL),
       simulate_fetch_via_proxy_(false),
       contents_mime_type_("text/html") {
   // For normal RenderViewHosts, this is freed when |Shutdown()| is called.
   // For TestRenderViewHost, the view is explicitly deleted in the destructor
@@ skipping 215 matching lines @@
 TestRenderViewHostFactory::~TestRenderViewHostFactory() {
   RenderViewHostFactory::UnregisterFactory();
 }
 
 void TestRenderViewHostFactory::set_render_process_host_factory(
     content::RenderProcessHostFactory* rph_factory) {
   render_process_host_factory_ = rph_factory;
 }
 
 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);
 }
 
 RenderViewHostTestHarness::RenderViewHostTestHarness()
     : rph_factory_(),
       rvh_factory_(&rph_factory_),
       contents_(NULL) {
 }
 
 RenderViewHostTestHarness::~RenderViewHostTestHarness() {
@@ skipping 37 matching lines @@
 void RenderViewHostTestHarness::SetContents(TestTabContents* contents) {
   contents_.reset(contents);
 }
 
 TestTabContents* RenderViewHostTestHarness::CreateTestTabContents() {
   // See comment above browser_context_ decl for why we check for NULL here.
   if (!browser_context_.get())
     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);
 }
 
 void RenderViewHostTestHarness::NavigateAndCommit(const GURL& url) {
   contents()->NavigateAndCommit(url);
 }
 
 void RenderViewHostTestHarness::Reload() {
   NavigationEntry* entry = controller().GetLastCommittedEntry();
@@ skipping 10 matching lines @@
   SetContents(NULL);
 
   // Make sure that we flush any messages related to TabContents destruction
   // before we destroy the browser context.
   MessageLoop::current()->RunAllPending();
 
   // Release the browser context on the UI thread.
   message_loop_.DeleteSoon(FROM_HERE, browser_context_.release());
   message_loop_.RunAllPending();
 }