(Reland) Remove about:srcdoc url conversion.

content/browser/frame_host/frame_tree_browsertest.cc

 // Copyright 2014 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/macros.h"
 #include "build/build_config.h"
 #include "content/browser/frame_host/frame_tree.h"
 #include "content/browser/frame_host/frame_tree_node.h"
 #include "content/browser/renderer_host/render_view_host_impl.h"
 #include "content/browser/web_contents/web_contents_impl.h"
@@ skipping 468 matching lines @@
   // be created in the same SiteInstance as the parent.
   {
     std::string script("var f = document.createElement('iframe');"
                        "f.srcdoc = 'some content';"
                        "document.body.appendChild(f)");
     TestNavigationObserver observer(shell()->web_contents());
     EXPECT_TRUE(ExecuteScript(root, script));
     EXPECT_EQ(2U, root->child_count());
     observer.Wait();
 
-    EXPECT_EQ(GURL(url::kAboutBlankURL), root->child_at(1)->current_url());
+    EXPECT_EQ(GURL(kAboutSrcDocURL), root->child_at(1)->current_url());
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         root->child_at(1), "domAutomationController.send(document.origin);",
         &frame_origin));
     EXPECT_EQ(root->current_frame_host()->GetLastCommittedURL().GetOrigin(),
               GURL(frame_origin));
     EXPECT_NE(child->current_frame_host()->GetLastCommittedURL().GetOrigin(),
               GURL(frame_origin));
   }
 
   // Set srcdoc on the existing cross-site frame. It should navigate the frame
   // back to the origin of the parent.
   {
     std::string script("var f = document.getElementById('child-0');"
                        "f.srcdoc = 'some content';");
     TestNavigationObserver observer(shell()->web_contents());
     EXPECT_TRUE(ExecuteScript(root, script));
     observer.Wait();
 
-    EXPECT_EQ(GURL(url::kAboutBlankURL), child->current_url());
+    EXPECT_EQ(GURL(kAboutSrcDocURL), child->current_url());
     EXPECT_TRUE(ExecuteScriptAndExtractString(
         child, "domAutomationController.send(document.origin);",
         &frame_origin));
     EXPECT_EQ(root->current_frame_host()->GetLastCommittedURL().GetOrigin(),
               GURL(frame_origin));
   }
 }
 
 // Ensure that sandbox flags are correctly set when child frames are created.
 IN_PROC_BROWSER_TEST_F(FrameTreeBrowserTest, SandboxFlagsSetForChildFrames) {
@@ skipping 236 matching lines @@
   // Make sure we did a process transfer back to "b.is".
   EXPECT_EQ(
       " Site A ------------ proxies for B\n"
       "   +--Site B ------- proxies for A\n"
       "Where A = http://a.com/\n"
       "      B = http://b.is/",
       FrameTreeVisualizer().DepictFrameTree(root));
 }
 
 }  // namespace content