Fix Blink commit type for subframes after initial about:blank load.

Source/web/tests/WebFrameTest.cpp

 /*
  * Copyright (C) 2010 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 5974 matching lines @@
     }
 
     bool replacesCurrentHistoryItem() { return m_replacesCurrentHistoryItem; }
     WebFrame* frame() { return m_frame; }
 
 private:
     bool m_replacesCurrentHistoryItem;
     WebFrame* m_frame;
 };
 
-// Test which ensures that the first navigation in a subframe will always
-// result in history entry being replaced and not a new one added.
-TEST_P(ParameterizedWebFrameTest, DISABLED_FirstFrameNavigationReplacesHistory)

[Charlie Reis, 2015/06/11 16:43:48]

This was Nasko's test from https://codereview.chromium.org/25269006/,
accompanying the fix I mentioned earlier.  Unfortunately, it was disabled 20
days later in https://crbug.com/310347 for being flaky (without much
notification to any of us or a record of how it was failing).

I think I've fixed the flakiness by using loadFrame on the subframe instead of
navigating to a javascript URL.  I've also split it into two tests just in case
the javascript URL in the second test is still flaky.

It now covers the cases for this bug, and I have additional test coverage for
the subframe commit lined up in the Chromium side as well.

+// Tests that the first navigation in an initially blank subframe will result in
+// a history entry being replaced and not a new one being added.
+TEST_P(ParameterizedWebFrameTest, FirstBlankSubframeNavigation)
 {
     registerMockedHttpURLLoad("history.html");
     registerMockedHttpURLLoad("find.html");
 
     FrameTestHelpers::WebViewHelper webViewHelper(this);
     TestHistoryWebFrameClient client;
     webViewHelper.initializeAndLoad("about:blank", true, &client);
-    EXPECT_TRUE(client.replacesCurrentHistoryItem());
 
     WebFrame* frame = webViewHelper.webView()->mainFrame();
 
-    FrameTestHelpers::loadFrame(frame,
-        "javascript:document.body.appendChild(document.createElement('iframe'))");
+    frame->executeScript(WebScriptSource(WebString::fromUTF8(
+        "document.body.appendChild(document.createElement('iframe'))")));
+
     WebFrame* iframe = frame->firstChild();
-    EXPECT_EQ(client.frame(), iframe);
+    ASSERT_EQ(&client, toWebLocalFrameImpl(iframe)->client());
+    EXPECT_EQ(iframe, client.frame());
+
+    std::string url1 = m_baseURL + "history.html";
+    FrameTestHelpers::loadFrame(iframe, url1);
+    EXPECT_EQ(iframe, client.frame());
+    EXPECT_EQ(url1, iframe->document().url().string().utf8());
     EXPECT_TRUE(client.replacesCurrentHistoryItem());
 
-    FrameTestHelpers::loadFrame(frame,
-        "javascript:window.frames[0].location.assign('" + m_baseURL + "history.html')");
-    EXPECT_EQ(client.frame(), iframe);
-    EXPECT_TRUE(client.replacesCurrentHistoryItem());
-
-    FrameTestHelpers::loadFrame(frame,
-        "javascript:window.frames[0].location.assign('" + m_baseURL + "find.html')");
-    EXPECT_EQ(client.frame(), iframe);
-    EXPECT_FALSE(client.replacesCurrentHistoryItem());
-
-    // Repeat the test, but start out the iframe with initial URL, which is not
-    // "about:blank".
-    FrameTestHelpers::loadFrame(frame,
-        "javascript:var f = document.createElement('iframe'); "
-        "f.src = '" + m_baseURL + "history.html';"
-        "document.body.appendChild(f)");
-
-    iframe = frame->firstChild()->nextSibling();
-    EXPECT_EQ(client.frame(), iframe);
-    EXPECT_TRUE(client.replacesCurrentHistoryItem());
-
-    FrameTestHelpers::loadFrame(frame,
-        "javascript:window.frames[1].location.assign('" + m_baseURL + "find.html')");
-    EXPECT_EQ(client.frame(), iframe);
+    std::string url2 = m_baseURL + "find.html";
+    FrameTestHelpers::loadFrame(iframe, url2);
+    EXPECT_EQ(iframe, client.frame());
+    EXPECT_EQ(url2, iframe->document().url().string().utf8());
     EXPECT_FALSE(client.replacesCurrentHistoryItem());
 }
 
+// Tests that a navigation in a frame with a non-blank initial URL will create
+// a new history item, unlike the case above.
+TEST_P(ParameterizedWebFrameTest, FirstNonBlankSubframeNavigation)
+{
+    registerMockedHttpURLLoad("history.html");
+    registerMockedHttpURLLoad("find.html");
+
+    FrameTestHelpers::WebViewHelper webViewHelper(this);
+    TestHistoryWebFrameClient client;
+    webViewHelper.initializeAndLoad("about:blank", true, &client);
+
+    WebFrame* frame = webViewHelper.webView()->mainFrame();
+
+    std::string url1 = m_baseURL + "history.html";
+    FrameTestHelpers::loadFrame(frame,
+        "javascript:var f = document.createElement('iframe'); "
+        "f.src = '" + url1 + "';"
+        "document.body.appendChild(f)");
+
+    WebFrame* iframe = frame->firstChild();
+    EXPECT_EQ(iframe, client.frame());
+    EXPECT_EQ(url1, iframe->document().url().string().utf8());
+
+    std::string url2 = m_baseURL + "find.html";
+    FrameTestHelpers::loadFrame(iframe, url2);
+    EXPECT_EQ(iframe, client.frame());
+    EXPECT_EQ(url2, iframe->document().url().string().utf8());
+    EXPECT_FALSE(client.replacesCurrentHistoryItem());
+}
+
 // Test verifies that layout will change a layer's scrollable attibutes
 TEST_F(WebFrameTest, overflowHiddenRewrite)
 {
     registerMockedHttpURLLoad("non-scrollable.html");
     OwnPtr<FakeCompositingWebViewClient> fakeCompositingWebViewClient = adoptPtr(new FakeCompositingWebViewClient());
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initialize(true, 0, fakeCompositingWebViewClient.get(), &configueCompositingWebView);
 
     webViewHelper.webView()->resize(WebSize(100, 100));
     FrameTestHelpers::loadFrame(webViewHelper.webView()->mainFrame(), m_baseURL + "non-scrollable.html");
@@ skipping 1413 matching lines @@
 
     EXPECT_EQ(parent, firstFrame->parent());
     EXPECT_EQ(parent, secondFrame->parent());
     EXPECT_EQ(parent, thirdFrame->parent());
     EXPECT_EQ(parent, fourthFrame->parent());
 
     view->close();
 }
 
 } // namespace blink