Add is_srcdoc to FrameNavigationEntry and restore about::srcdoc URL.

content/browser/frame_host/navigation_controller_impl_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 "content/browser/frame_host/navigation_controller_impl.h"
 
 #include <stdint.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
@@ skipping 3331 matching lines @@
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(1, controller.GetLastCommittedEntryIndex());
 
   // 3. Go back, recreating the subframes.
   {
     TestNavigationObserver back_load_observer(shell()->web_contents());
     controller.GoBack();
     back_load_observer.Wait();
   }
   ASSERT_EQ(1U, root->child_count());
-  // TODO(creis): This line is unexpectedly failing in PlzNavigate, so the test
-  // is disabled there for now.
   ASSERT_EQ(1U, root->child_at(0)->child_count());
   ASSERT_EQ(0U, root->child_at(0)->child_at(0)->child_count());
   EXPECT_EQ(main_url, root->current_url());
   EXPECT_EQ(blank_url, root->child_at(0)->current_url());
 
   // Verify that the inner iframe went to the correct URL.
   EXPECT_EQ(inner_url, root->child_at(0)->child_at(0)->current_url());
 
   EXPECT_EQ(2, controller.GetEntryCount());
   EXPECT_EQ(0, controller.GetLastCommittedEntryIndex());
@@ skipping 3417 matching lines @@
 
     // Check the FrameNavigationEntry's referrer.
     NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
     ASSERT_EQ(1U, entry->root_node()->children.size());
     FrameNavigationEntry* frame_entry =
         entry->root_node()->children[0]->frame_entry.get();
     EXPECT_EQ(frame_entry->referrer().url, url);
   }
 }
 
+// Verifies that FrameNavigationEntry's srcdoc attribute is valid.

[alexmos, 2016/11/07 22:51:46]

nit: might be useful to include a reference to https://crbug.com/660061, if
that's the right bug.

[arthursonzogni, 2016/11/08 12:21:30]

Yes, this CL is related to this bug. But this test doesn't fail because of this
bug. It simply tests that the new attribute that was added in the patch
|is_srcdoc| is correctly set.
I don't think it should be added there.

At most, maybe the reference could be added with
FrameNavigationEntry_RecreatedInjectedSrcdocSubframe. What do you think?

+IN_PROC_BROWSER_TEST_F(NavigationControllerBrowserTest,
+                       FrameNavigationEntry_Srcdoc) {
+  // This test only makes sense when subframe FrameNavigationEntries are in use.
+  if (!SiteIsolationPolicy::UseSubframeNavigationEntries())
+    return;
+
+  const NavigationControllerImpl& controller =
+      static_cast<const NavigationControllerImpl&>(
+          shell()->web_contents()->GetController());
+
+  // Navigate to a page with two iframes, one with the srcdoc attribute and one
+  // without it.
+  GURL url(embedded_test_server()->GetURL(
+      "/navigation_controller/page_with_srcdoc.html"));
+  ASSERT_TRUE(NavigateToURL(shell(), url));
+
+  // Check that there is two iframes.
+  ASSERT_EQ(1, controller.GetEntryCount());
+  NavigationEntryImpl* entry = controller.GetLastCommittedEntry();
+  ASSERT_EQ(2U, entry->root_node()->children.size());
+  FrameNavigationEntry* frame_entry_1 =
+      entry->root_node()->children[0]->frame_entry.get();
+  FrameNavigationEntry* frame_entry_2 =
+      entry->root_node()->children[1]->frame_entry.get();
+
+  // The FrameNavigationEntry's order is not guaranteed to be preserved. Swap
+  // the entries if there is an inversion.

[alexmos, 2016/11/07 22:51:45]

Instead of reordering, can you get the FNEs via FrameTreeNodes, via something
like entry->GetFrameEntry(root->child_at(0)), which should have the right order?
 (E.g., see EnsureFrameNavigationEntriesClearedOnMismatch which does this).

[arthursonzogni, 2016/11/08 12:21:30]

Thanks! It is better now.

+  GURL iframe_2_url(embedded_test_server()->GetURL(
+      "/navigation_controller/simple_page_1.html"));
+  if (frame_entry_2->url() != iframe_2_url)
+    std::swap(frame_entry_1,frame_entry_2);
+
+  // Check the is_srcdoc() method returns the right value.
+  EXPECT_EQ(frame_entry_1->is_srcdoc(), true);
+  EXPECT_EQ(frame_entry_2->is_srcdoc(), false);
+
+  // Check the iframe URL has been converted from about::srcdoc to about::blank.
+  EXPECT_EQ(frame_entry_1->url(), GURL(url::kAboutBlankURL));
+  EXPECT_EQ(frame_entry_2->url(), iframe_2_url);

[alexmos, 2016/11/07 22:51:46]

Is the part with restoring a srcdoc iframe after a back-forward navigation
already tested in FrameNavigationEntry_RecreatedInjectedSrcdocSubframe that
you're re-enabling?

[arthursonzogni, 2016/11/08 12:21:30]

I am not sure I fully understand the question. Theses two tests are unrelated.
One tests that iframe with srcdoc are recreated within a back-forward
navigation. The other is simply an unit test that ensure that the new
|is_srcdoc| attribute is correctly set.

+}
+
 namespace {
 
 class RequestMonitoringNavigationBrowserTest : public ContentBrowserTest {
  public:
   RequestMonitoringNavigationBrowserTest() : weak_factory_(this) {}
 
   const net::test_server::HttpRequest* FindAccumulatedRequest(
       const GURL& url_to_find) {
     // net::test_server::HttpRequest::GetURL hardcodes "http://localhost/" part.
     GURL::Replacements replacements;
@@ skipping 102 matching lines @@
   // Verify that the extra header was NOT present for the subresource.
   const net::test_server::HttpRequest* image_request =
       FindAccumulatedRequest(image_url);
   ASSERT_TRUE(image_request);
   EXPECT_THAT(image_request->headers,
               testing::Not(testing::Contains(
                   testing::Key("X-ExtraHeadersVsSubresources"))));
 }
 
 }  // namespace content