Remove about:srcdoc url conversion.

content/browser/site_instance_impl_unittest.cc

 // Copyright (c) 2012 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 "content/browser/site_instance_impl.h"
 
 #include <stddef.h>
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
@@ skipping 375 matching lines @@
 // Test of distinguishing URLs from different sites.  Most of this logic is
 // tested in RegistryControlledDomainTest.  This test focuses on URLs with
 // different schemes or ports.
 TEST_F(SiteInstanceTest, IsSameWebSite) {
   GURL url_foo = GURL("http://foo/a.html");
   GURL url_foo2 = GURL("http://foo/b.html");
   GURL url_foo_https = GURL("https://foo/a.html");
   GURL url_foo_port = GURL("http://foo:8080/a.html");
   GURL url_javascript = GURL("javascript:alert(1);");
   GURL url_blank = GURL(url::kAboutBlankURL);
+  GURL url_srcdoc = GURL(content::kAboutSrcDocURL);
 
   // Same scheme and port -> same site.
   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo, url_foo2));
 
   // Different scheme -> different site.
   EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_foo, url_foo_https));
 
   // Different port -> same site.
   // (Changes to document.domain make renderer ignore the port.)
   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo, url_foo_port));
 
   // JavaScript links should be considered same site for anything.
   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_javascript, url_foo));
   EXPECT_TRUE(
       SiteInstance::IsSameWebSite(nullptr, url_javascript, url_foo_https));
   EXPECT_TRUE(
       SiteInstance::IsSameWebSite(nullptr, url_javascript, url_foo_port));
 
-  // Navigating to a blank page is considered the same site.
+  // Navigating to a blank page or about:srcdoc is considered the same site.

[Charlie Reis, 2016/11/22 01:01:20]

As mentioned earlier, let's leave this out, or maybe explicitly test that it's
not treated as the same.  (Even better would be to test what happens in the
example I mentioned, though that could be in a separate CL if needed.)

[arthursonzogni, 2016/11/22 16:43:27]

Done (see above).

   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo, url_blank));
   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo_https, url_blank));
   EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo_port, url_blank));
+  EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo, url_srcdoc));
+  EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo_https, url_srcdoc));
+  EXPECT_TRUE(SiteInstance::IsSameWebSite(nullptr, url_foo_port, url_srcdoc));
 
-  // Navigating from a blank site is not considered to be the same site.
+  // Navigating from a blank site or from about:srcdoc is not considered to be
+  // the same site.
   EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_blank, url_foo));
   EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_blank, url_foo_https));
   EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_blank, url_foo_port));
+  EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_srcdoc, url_foo));
+  EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_srcdoc, url_foo_https));
+  EXPECT_FALSE(SiteInstance::IsSameWebSite(nullptr, url_srcdoc, url_foo_port));
 
   DrainMessageLoop();
 }
 
 // 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) {
   ASSERT_FALSE(base::CommandLine::ForCurrentProcess()->HasSwitch(
       switches::kProcessPerSite));
   std::unique_ptr<TestBrowserContext> browser_context(new TestBrowserContext());
@@ skipping 407 matching lines @@
   EXPECT_EQ(1, browser_client()->GetAndClearSiteInstanceDeleteCount());
   EXPECT_EQ(0, browser_client()->GetAndClearBrowsingInstanceDeleteCount());
 
   // Free the subframe instance, which should free the browsing instance.
   subframe_instance = nullptr;
   EXPECT_EQ(1, browser_client()->GetAndClearSiteInstanceDeleteCount());
   EXPECT_EQ(1, browser_client()->GetAndClearBrowsingInstanceDeleteCount());
 }
 
 }  // namespace content