summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:58:36 +0000
committeravi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-11-18 19:58:36 +0000
commit48c2e69a20ef0842dba1b310e8f8632f113897d9 (patch)
treef9f664ecf8cdf7181bcdbc1302c4a7a467e83beb
parent7d5080bfe2ebdcd95d61aabd11fe801d733f60e4 (diff)
downloadchromium_src-48c2e69a20ef0842dba1b310e8f8632f113897d9.zip
chromium_src-48c2e69a20ef0842dba1b310e8f8632f113897d9.tar.gz
chromium_src-48c2e69a20ef0842dba1b310e8f8632f113897d9.tar.bz2
Ensure that in the SiteInstanceTest, no actual RenderProcessHosts are created.
BUG=none TEST=tests keep passing Review URL: https://codereview.chromium.org/72333003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235800 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--content/browser/site_instance_impl_unittest.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/content/browser/site_instance_impl_unittest.cc b/content/browser/site_instance_impl_unittest.cc
index 5b7606d..5524091 100644
--- a/content/browser/site_instance_impl_unittest.cc
+++ b/content/browser/site_instance_impl_unittest.cc
@@ -94,6 +94,8 @@ class SiteInstanceTest : public testing::Test {
old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
url_util::AddStandardScheme(kPrivilegedScheme);
url_util::AddStandardScheme(chrome::kChromeUIScheme);
+
+ SiteInstanceImpl::set_render_process_host_factory(&rph_factory_);
}
virtual void TearDown() {
@@ -135,6 +137,7 @@ class SiteInstanceTest : public testing::Test {
SiteInstanceTestBrowserClient browser_client_;
ContentBrowserClient* old_browser_client_;
+ MockRenderProcessHostFactory rph_factory_;
};
// Subclass of BrowsingInstance that updates a counter when deleted and
@@ -551,8 +554,6 @@ static SiteInstanceImpl* CreateSiteInstance(BrowserContext* browser_context,
// Test to ensure that pages that require certain privileges are grouped
// in processes with similar pages.
TEST_F(SiteInstanceTest, ProcessSharingByType) {
- MockRenderProcessHostFactory rph_factory;
- SiteInstanceImpl::set_render_process_host_factory(&rph_factory);
ChildProcessSecurityPolicyImpl* policy =
ChildProcessSecurityPolicyImpl::GetInstance();