Don't swap processes for javascript: URLs.

content/browser/site_instance_unittest.cc

 // Copyright (c) 2011 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 "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "base/string16.h"
 #include "content/browser/browser_thread_impl.h"
 #include "content/browser/browsing_instance.h"
 #include "content/browser/child_process_security_policy.h"
@@ skipping 101 matching lines @@
 
   SiteInstanceTestBrowserClient browser_client_;
   content::ContentBrowserClient* old_browser_client_;
 };
 
 class TestBrowsingInstance : public BrowsingInstance {
  public:
   TestBrowsingInstance(content::BrowserContext* browser_context,
                        int* deleteCounter)
       : BrowsingInstance(browser_context),
-        use_process_per_site(false),
-        deleteCounter_(deleteCounter) {
+        use_process_per_site_(false),
+        delete_counter_(deleteCounter) {

[awong, 2012/01/13 21:19:04]

nit: %s/deleteCounter/delete_counter/g

[nasko, 2012/01/13 21:47:10]

Done.

   }
 
   // Overrides BrowsingInstance::ShouldUseProcessPerSite so that we can test
   // both alternatives without using command-line switches.
   bool ShouldUseProcessPerSite(const GURL& url) {
-    return use_process_per_site;
+    return use_process_per_site_;
+  }
+
+  void set_use_process_per_site(bool use_process_per_site) {
+    use_process_per_site_ = use_process_per_site;
+  }
+
+ private:
+  virtual ~TestBrowsingInstance() {
+    (*delete_counter_)++;
   }
 
   // Set by individual tests.
-  bool use_process_per_site;
+  bool use_process_per_site_;
 
- private:
-  ~TestBrowsingInstance() {
-    (*deleteCounter_)++;
-  }
-
-  int* deleteCounter_;
+  int* delete_counter_;
 };
 
 class TestSiteInstance : public SiteInstance {
  public:
   static TestSiteInstance* CreateTestSiteInstance(
       content::BrowserContext* browser_context,
       int* siteDeleteCounter,
       int* browsingDeleteCounter) {
     TestBrowsingInstance* browsing_instance =
         new TestBrowsingInstance(browser_context, browsingDeleteCounter);
     return new TestSiteInstance(browsing_instance, siteDeleteCounter);
   }
 
+  void SetHasProcess(bool process) {

[Charlie Reis, 2012/01/13 21:16:29]

set_has_process, since it's just a setter function.

[nasko, 2012/01/13 21:47:10]

Function is not needed anymore, since I create a real process in the test.

+    has_process_ = process;
+  }
+
  private:
   TestSiteInstance(BrowsingInstance* browsing_instance, int* deleteCounter)
-    : SiteInstance(browsing_instance), deleteCounter_(deleteCounter) {}
-  ~TestSiteInstance() {
-    (*deleteCounter_)++;
+    : SiteInstance(browsing_instance), delete_counter_(deleteCounter) {}
+  virtual ~TestSiteInstance() {
+    (*delete_counter_)++;
   }
 
-  int* deleteCounter_;
+  int* delete_counter_;
+  bool has_process_;
 };
 
 }  // namespace
 
 // Test to ensure no memory leaks for SiteInstance objects.
 TEST_F(SiteInstanceTest, SiteInstanceDestructor) {
   // The existence of these factories will cause TabContents to create our test
   // one instead of the real one.
   MockRenderProcessHostFactory rph_factory;
   TestRenderViewHostFactory rvh_factory(&rph_factory);
@@ skipping 187 matching lines @@
   EXPECT_TRUE(
       SiteInstance::IsSameWebSite(NULL, url_browser_specified, url_foo));
 }
 
 // Test to ensure that there is only one SiteInstance per site in a given
 // BrowsingInstance, when process-per-site is not in use.
 TEST_F(SiteInstanceTest, OneSiteInstancePerSite) {
   int deleteCounter = 0;
   TestBrowsingInstance* browsing_instance =
       new TestBrowsingInstance(NULL, &deleteCounter);
-  browsing_instance->use_process_per_site = false;
+  browsing_instance->set_use_process_per_site(false);
 
   const GURL url_a1("http://www.google.com/1.html");
   scoped_refptr<SiteInstance> site_instance_a1(
       browsing_instance->GetSiteInstanceForURL(url_a1));
   EXPECT_TRUE(site_instance_a1.get() != NULL);
 
   // A separate site should create a separate SiteInstance.
   const GURL url_b1("http://www.yahoo.com/");
   scoped_refptr<SiteInstance> site_instance_b1(
       browsing_instance->GetSiteInstanceForURL(url_b1));
   EXPECT_NE(site_instance_a1.get(), site_instance_b1.get());
 
   // Getting the new SiteInstance from the BrowsingInstance and from another
   // SiteInstance in the BrowsingInstance should give the same result.
   EXPECT_EQ(site_instance_b1.get(),
             site_instance_a1->GetRelatedSiteInstance(url_b1));
 
   // A second visit to the original site should return the same SiteInstance.
   const GURL url_a2("http://www.google.com/2.html");
   EXPECT_EQ(site_instance_a1.get(),
             browsing_instance->GetSiteInstanceForURL(url_a2));
   EXPECT_EQ(site_instance_a1.get(),
             site_instance_a1->GetRelatedSiteInstance(url_a2));
 
   // A visit to the original site in a new BrowsingInstance (same or different
   // browser context) should return a different SiteInstance.
   TestBrowsingInstance* browsing_instance2 =
       new TestBrowsingInstance(NULL, &deleteCounter);
-  browsing_instance2->use_process_per_site = false;
+  browsing_instance2->set_use_process_per_site(false);
   // Ensure the new SiteInstance is ref counted so that it gets deleted.
   scoped_refptr<SiteInstance> site_instance_a2_2(
       browsing_instance2->GetSiteInstanceForURL(url_a2));
   EXPECT_NE(site_instance_a1.get(), site_instance_a2_2.get());
 
   // Should be able to see that we do have SiteInstances.
   EXPECT_TRUE(browsing_instance->HasSiteInstance(
       GURL("http://mail.google.com")));
   EXPECT_TRUE(browsing_instance2->HasSiteInstance(
       GURL("http://mail.google.com")));
   EXPECT_TRUE(browsing_instance->HasSiteInstance(
       GURL("http://mail.yahoo.com")));
 
   // Should be able to see that we don't have SiteInstances.
   EXPECT_FALSE(browsing_instance->HasSiteInstance(
       GURL("https://www.google.com")));
   EXPECT_FALSE(browsing_instance2->HasSiteInstance(
       GURL("http://www.yahoo.com")));
 
   // browsing_instances will be deleted when their SiteInstances are deleted
 }
 
 // Test to ensure that there is only one SiteInstance per site for an entire
 // BrowserContext, if process-per-site is in use.
 TEST_F(SiteInstanceTest, OneSiteInstancePerSiteInBrowserContext) {
   int deleteCounter = 0;
   TestBrowsingInstance* browsing_instance =
       new TestBrowsingInstance(NULL, &deleteCounter);
-  browsing_instance->use_process_per_site = true;
+  browsing_instance->set_use_process_per_site(true);
 
   const GURL url_a1("http://www.google.com/1.html");
   scoped_refptr<SiteInstance> site_instance_a1(
       browsing_instance->GetSiteInstanceForURL(url_a1));
   EXPECT_TRUE(site_instance_a1.get() != NULL);
 
   // A separate site should create a separate SiteInstance.
   const GURL url_b1("http://www.yahoo.com/");
   scoped_refptr<SiteInstance> site_instance_b1(
       browsing_instance->GetSiteInstanceForURL(url_b1));
@@ skipping 11 matching lines @@
   EXPECT_EQ(site_instance_a1.get(),
             site_instance_a1->GetRelatedSiteInstance(url_a2));
 
   // A visit to the original site in a new BrowsingInstance (same browser
   // context) should also return the same SiteInstance.
   // This BrowsingInstance doesn't get its own SiteInstance within the test, so
   // it won't be deleted by its children.  Thus, we'll keep a ref count to it
   // to make sure it gets deleted.
   scoped_refptr<TestBrowsingInstance> browsing_instance2(
       new TestBrowsingInstance(NULL, &deleteCounter));
-  browsing_instance2->use_process_per_site = true;
+  browsing_instance2->set_use_process_per_site(true);
   EXPECT_EQ(site_instance_a1.get(),
             browsing_instance2->GetSiteInstanceForURL(url_a2));
 
   // A visit to the original site in a new BrowsingInstance (different browser
   // context) should return a different SiteInstance.
   scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
   TestBrowsingInstance* browsing_instance3 =
       new TestBrowsingInstance(browser_context.get(), &deleteCounter);
-  browsing_instance3->use_process_per_site = true;
+  browsing_instance3->set_use_process_per_site(true);
   // Ensure the new SiteInstance is ref counted so that it gets deleted.
   scoped_refptr<SiteInstance> site_instance_a2_3(
       browsing_instance3->GetSiteInstanceForURL(url_a2));
   EXPECT_NE(site_instance_a1.get(), site_instance_a2_3.get());
 
   // Should be able to see that we do have SiteInstances.
   EXPECT_TRUE(browsing_instance->HasSiteInstance(
       GURL("http://mail.google.com")));  // visited before
   EXPECT_TRUE(browsing_instance2->HasSiteInstance(
       GURL("http://mail.google.com")));  // visited before
@@ skipping 43 matching lines @@
   scoped_ptr<content::RenderProcessHost> extension_host(
       extension1_instance->GetProcess());
   EXPECT_EQ(extension1_instance->GetProcess(),
             extension2_instance->GetProcess());
 
   // Create some WebUI instances and make sure they share a process.
   scoped_refptr<SiteInstance> webui1_instance(CreateSiteInstance(&rph_factory,
       GURL(chrome::kChromeUIScheme + std::string("://newtab"))));
   policy->GrantWebUIBindings(webui1_instance->GetProcess()->GetID());
 
-  scoped_refptr<SiteInstance> webui2_instance( CreateSiteInstance(&rph_factory,
+  scoped_refptr<SiteInstance> webui2_instance(CreateSiteInstance(&rph_factory,
       GURL(chrome::kChromeUIScheme + std::string("://history"))));
 
   scoped_ptr<content::RenderProcessHost> dom_host(
       webui1_instance->GetProcess());
   EXPECT_EQ(webui1_instance->GetProcess(), webui2_instance->GetProcess());
 
   // Make sure none of differing privilege processes are mixed.
   EXPECT_NE(extension1_instance->GetProcess(), webui1_instance->GetProcess());
 
   for (size_t i = 0; i < content::kMaxRendererProcessCount; ++i) {
     EXPECT_NE(extension1_instance->GetProcess(), hosts[i]);
     EXPECT_NE(webui1_instance->GetProcess(), hosts[i]);
   }
 
   STLDeleteContainerPointers(hosts.begin(), hosts.end());
 }
+
+// Test to ensure that HasWrongProcessForURL behaves properly for different
+// types of URLs.
+TEST_F(SiteInstanceTest, HasWrongProcessForURL) {
+  scoped_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
+  scoped_ptr<content::RenderProcessHost> host;
+  scoped_refptr<SiteInstance> instance(
+      SiteInstance::CreateSiteInstance(browser_context.get()));
+
+  EXPECT_FALSE(instance->has_site());
+  EXPECT_TRUE(instance->site().is_empty());
+
+  instance->SetSite(GURL("http://evernote.com/"));
+  EXPECT_TRUE(instance->has_site());
+
+  // Check prior to "assigning" a process to the instance, which is expected
+  // to return false due to not being attached to any process yet.
+  EXPECT_FALSE(instance->HasWrongProcessForURL(GURL("http://google.com")));
+
+  // The call to GetProcess actually creates a new real process, which works
+  // fine, but might be a cause for problems in different contexts.
+  host.reset(instance->GetProcess());
+  EXPECT_TRUE(host.get() != NULL);

[awong, 2012/01/13 21:19:04]

EXPECT_TRUE(host.get()) is jsut as common (maybe more common).

Up to you if you like the explicit != NULL.

[nasko, 2012/01/13 21:47:10]

I was trying to be consistent with the rest of the file :).

+  EXPECT_TRUE(instance->HasProcess());
+
+  EXPECT_FALSE(instance->HasWrongProcessForURL(GURL("http://evernote.com")));
+  EXPECT_FALSE(instance->HasWrongProcessForURL(
+      GURL("javascript:alert(document.location.href);")));
+
+  EXPECT_TRUE(instance->HasWrongProcessForURL(GURL("chrome://settings")));
+}