Expose a cachePolicy parameter to loadHistoryItem.

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 4623 matching lines @@
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     EXPECT_FALSE(frame->previousHistoryItem().isNull());
     EXPECT_EQ(WebString::fromUTF8("POST"), frame->dataSource()->request().httpMethod());
 
     frame->reload();
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
     EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
     EXPECT_EQ(WebNavigationTypeFormResubmitted, frame->dataSource()->navigationType());
 }
 
+TEST_F(WebFrameTest, LoadHistoryItemReload)
+{
+    registerMockedHttpURLLoad("fragment_middle_click.html");
+    FrameTestHelpers::WebViewHelper webViewHelper;
+    webViewHelper.initializeAndLoad(m_baseURL + "fragment_middle_click.html", true);
+    WebFrame* frame = webViewHelper.webView()->mainFrame();
+    WebHistoryItem firstItem = frame->currentHistoryItem();
+    EXPECT_FALSE(firstItem.isNull());
+
+    registerMockedHttpURLLoad("white-1x1.png");
+    FrameTestHelpers::loadFrame(frame, m_baseURL + "white-1x1.png");
+    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+    EXPECT_FALSE(frame->previousHistoryItem().isNull());
+    EXPECT_EQ(firstItem.urlString(), frame->previousHistoryItem().urlString());
+
+    // Cache policy overrides should take.
+    frame->loadHistoryItem(frame->previousHistoryItem(), WebURLRequest::ReloadIgnoringCacheData);
+    Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
+    EXPECT_EQ(firstItem.urlString(), frame->currentHistoryItem().urlString());
+    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+}
+
 
 class TestCachePolicyWebFrameClient : public WebFrameClient {
 public:
     TestCachePolicyWebFrameClient()
         : m_policy(WebURLRequest::UseProtocolCachePolicy)
         , m_client(0)
         , m_willSendRequestCallCount(0)
         , m_childFrameCreationCount(0)
     {
     }
@@ skipping 279 matching lines @@
 
     Platform::current()->unitTestSupport()->serveAsynchronousMockedRequests();
 
     // After commit, there is.
     WebHistoryItem item = frame->currentHistoryItem();
     ASSERT_FALSE(item.isNull());
     EXPECT_EQ(url, item.urlString().utf8());
 }
 
 } // namespace