Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / content / browser / site_instance_impl_unittest.cc

diff --git a/src/content/browser/site_instance_impl_unittest.cc b/src/content/browser/site_instance_impl_unittest.cc
index 714b6e4..646f4d0 100644 (file)
--- a/src/content/browser/site_instance_impl_unittest.cc
+++ b/src/content/browser/site_instance_impl_unittest.cc
@@ -92,8 +92,8 @@ class SiteInstanceTest : public testing::Test {
 
   virtual void SetUp() {
     old_browser_client_ = SetBrowserClientForTesting(&browser_client_);
-    url_util::AddStandardScheme(kPrivilegedScheme);
-    url_util::AddStandardScheme(kChromeUIScheme);
+    url::AddStandardScheme(kPrivilegedScheme);
+    url::AddStandardScheme(kChromeUIScheme);
 
     SiteInstanceImpl::set_render_process_host_factory(&rph_factory_);
   }
@@ -557,6 +557,11 @@ 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) {
+  // This test shouldn't run with --site-per-process mode, since it doesn't
+  // allow render process reuse, which this test explicitly exercises.
+  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kSitePerProcess))
+    return;
+
   ChildProcessSecurityPolicyImpl* policy =
       ChildProcessSecurityPolicyImpl::GetInstance();