Pass the SiteInstance into CreateRenderProcessHost

so that the RenderProcessHostFactory has as much information as the default branch. TBR=gbillock Review URL: https://chromiumcodereview.appspot.com/16490003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@204613 0039d316-1c4b-4281-b951-d872f2087c98
dednal · Jun 6, 2013 · f681b07 · f681b07
1 parent c086bab
commit f681b07
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 9 deletions.
diff --git a/chrome/browser/media_galleries/media_file_system_registry_unittest.cc b/chrome/browser/media_galleries/media_file_system_registry_unittest.cc
@@ -220,7 +220,8 @@ class MockProfileSharedRenderProcessHostFactory
       content::BrowserContext* browser_context);
 
   virtual content::RenderProcessHost* CreateRenderProcessHost(
-      content::BrowserContext* browser_context) const OVERRIDE;
+      content::BrowserContext* browser_context,
+      content::SiteInstance* site_instance) const OVERRIDE;
 
  private:
   typedef std::map<content::BrowserContext*, content::MockRenderProcessHost*>
@@ -416,7 +417,8 @@ MockProfileSharedRenderProcessHostFactory::ReleaseRPH(
 
 content::RenderProcessHost*
 MockProfileSharedRenderProcessHostFactory::CreateRenderProcessHost(
-    content::BrowserContext* browser_context) const {
+    content::BrowserContext* browser_context,
+    content::SiteInstance* site_instance) const {
   ProfileRPHMap::const_iterator existing = rph_map_.find(browser_context);
   if (existing != rph_map_.end())
     return existing->second;

diff --git a/components/visitedlink/test/visitedlink_unittest.cc b/components/visitedlink/test/visitedlink_unittest.cc
@@ -579,7 +579,8 @@ class VisitedLinkRenderProcessHostFactory
   VisitedLinkRenderProcessHostFactory()
       : content::RenderProcessHostFactory() {}
   virtual content::RenderProcessHost* CreateRenderProcessHost(
-      content::BrowserContext* browser_context) const OVERRIDE {
+      content::BrowserContext* browser_context,
+      content::SiteInstance* site_instance) const OVERRIDE {
     return new VisitRelayingRenderProcessHost(browser_context);
   }
 

diff --git a/content/browser/renderer_host/text_input_client_mac_unittest.mm b/content/browser/renderer_host/text_input_client_mac_unittest.mm
@@ -40,7 +40,8 @@
         process_factory_(),
         delegate_(),
         widget_(&delegate_,
-                process_factory_.CreateRenderProcessHost(&browser_context_),
+                process_factory_.CreateRenderProcessHost(
+                    &browser_context_, NULL),
                 MSG_ROUTING_NONE),
         thread_("TextInputClientMacTestThread") {}
 

diff --git a/content/browser/site_instance_impl.cc b/content/browser/site_instance_impl.cc
@@ -114,7 +114,7 @@ RenderProcessHost* SiteInstanceImpl::GetProcess() {
     if (!process_) {
       if (g_render_process_host_factory_) {
         process_ = g_render_process_host_factory_->CreateRenderProcessHost(
-            browser_context);
+            browser_context, this);
       } else {
         StoragePartitionImpl* partition =
             static_cast<StoragePartitionImpl*>(

diff --git a/content/public/browser/render_process_host_factory.h b/content/public/browser/render_process_host_factory.h
@@ -10,18 +10,20 @@
 
 namespace content {
 class BrowserContext;
+class ContentBrowserClient;
 class RenderProcessHost;
+class SiteInstance;
 
 // Factory object for RenderProcessHosts. Using this factory allows tests to
 // swap out a different one to use a TestRenderProcessHost.
 class RenderProcessHostFactory {
  public:
   virtual ~RenderProcessHostFactory() {}
   virtual RenderProcessHost* CreateRenderProcessHost(
-      BrowserContext* browser_context) const = 0;
+      BrowserContext* browser_context,
+      SiteInstance* site_instance) const = 0;
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_RENDER_PROCESS_HOST_FACTORY_H_
-
diff --git a/content/public/test/mock_render_process_host.cc b/content/public/test/mock_render_process_host.cc
@@ -253,7 +253,8 @@ MockRenderProcessHostFactory::~MockRenderProcessHostFactory() {
 }
 
 RenderProcessHost* MockRenderProcessHostFactory::CreateRenderProcessHost(
-    BrowserContext* browser_context) const {
+    BrowserContext* browser_context,
+    SiteInstance* site_instance) const {
   MockRenderProcessHost* host = new MockRenderProcessHost(browser_context);
   if (host) {
     processes_.push_back(host);

diff --git a/content/public/test/mock_render_process_host.h b/content/public/test/mock_render_process_host.h
@@ -111,7 +111,8 @@ class MockRenderProcessHostFactory : public RenderProcessHostFactory {
   virtual ~MockRenderProcessHostFactory();
 
   virtual RenderProcessHost* CreateRenderProcessHost(
-      BrowserContext* browser_context) const OVERRIDE;
+      BrowserContext* browser_context,
+      SiteInstance* site_instance) const OVERRIDE;
 
   // Removes the given MockRenderProcessHost from the MockRenderProcessHost list
   // without deleting it. When a test deletes a MockRenderProcessHost, we need