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
This commit is contained in:
chrome/browser/media_galleries
components/visitedlink/test
content
browser
public
@ -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;
|
||||
|
@ -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);
|
||||
}
|
||||
|
||||
|
@ -40,7 +40,8 @@ class TextInputClientMacTest : public testing::Test {
|
||||
process_factory_(),
|
||||
delegate_(),
|
||||
widget_(&delegate_,
|
||||
process_factory_.CreateRenderProcessHost(&browser_context_),
|
||||
process_factory_.CreateRenderProcessHost(
|
||||
&browser_context_, NULL),
|
||||
MSG_ROUTING_NONE),
|
||||
thread_("TextInputClientMacTestThread") {}
|
||||
|
||||
|
@ -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*>(
|
||||
|
@ -10,7 +10,9 @@
|
||||
|
||||
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.
|
||||
@ -18,10 +20,10 @@ 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_
|
||||
|
||||
|
@ -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);
|
||||
|
@ -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
|
||||
|
Reference in New Issue
Block a user