Reland "Make same-document history navigations commit with the proper type."

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 5082 matching lines @@
     registerMockedHttpURLLoad("push_state.html");
     TestStartStopCallbackWebFrameClient client;
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);
 
     EXPECT_EQ(client.startLoadingCount(), 2);
     EXPECT_EQ(client.stopLoadingCount(), 2);
     EXPECT_EQ(client.differentDocumentStartCount(), 1);
 }
 
+class TestDidNavigateCommitTypeWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
+public:
+    TestDidNavigateCommitTypeWebFrameClient()
+        : m_lastCommitType(WebHistoryInertCommit)
+    {
+    }
+
+    virtual void didNavigateWithinPage(WebLocalFrame*, const WebHistoryItem&, WebHistoryCommitType type) OVERRIDE
+    {
+        m_lastCommitType = type;
+    }
+
+    WebHistoryCommitType lastCommitType() const { return m_lastCommitType; }
+
+private:
+    WebHistoryCommitType m_lastCommitType;
+};
+
+TEST_F(WebFrameTest, SameDocumentHistoryNavigationCommitType)
+{
+    registerMockedHttpURLLoad("push_state.html");
+    TestDidNavigateCommitTypeWebFrameClient client;
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    WebViewImpl* webViewImpl = webViewHelper.initializeAndLoad(m_baseURL + "push_state.html", true, &client);
+    RefPtr<WebCore::HistoryItem> item = webViewImpl->page()->mainFrame()->loader().currentItem();
+    runPendingTasks();
+
+    webViewImpl->page()->mainFrame()->loader().loadHistoryItem(item.get(), WebCore::HistorySameDocumentLoad);
+    EXPECT_EQ(WebBackForwardCommit, client.lastCommitType());
+}
+
 class TestHistoryWebFrameClient : public FrameTestHelpers::TestWebFrameClient {
 public:
     TestHistoryWebFrameClient()
     {
         m_replacesCurrentHistoryItem = false;
         m_frame = 0;
     }
     void didStartProvisionalLoad(WebLocalFrame* frame)
     {
         WebDataSource* ds = frame->provisionalDataSource();
@@ skipping 289 matching lines @@
     registerMockedHttpURLLoad("link-manifest-change.html");
 
     ManifestChangeWebFrameClient webFrameClient;
     FrameTestHelpers::WebViewHelper webViewHelper;
     webViewHelper.initializeAndLoad(m_baseURL + "link-manifest-change.html", true, &webFrameClient);
 
     EXPECT_EQ(14, webFrameClient.manifestChangeCount());
 }
 
 } // namespace