Add a value for end-to-end reloads in Cache policy

Source/web/tests/WebFrameTest.cpp

Index: Source/web/tests/WebFrameTest.cpp
diff --git a/Source/web/tests/WebFrameTest.cpp b/Source/web/tests/WebFrameTest.cpp
index 62992d996a65e768a79db90e8586d52ced11aed9..e8c17f8bed70342596fb34f7baa252369999d062 100644
--- a/Source/web/tests/WebFrameTest.cpp
+++ b/Source/web/tests/WebFrameTest.cpp
@@ -4827,7 +4827,8 @@ TEST_F(WebFrameTest, BackToReload)
     EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
 
     FrameTestHelpers::reloadFrame(frame);
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_TRUE(frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadIgnoringCacheData

[ppi, 2014/06/01 23:57:04]

I think we'd prefer to be precise about the expected value. Are all these calls
to cachePolicy() going to move from ReloadIgnoringCacheData to
ReloadBypassingCache with CLs 4 and 5?

[clamy, 2014/06/02 05:54:47]

I think I'll handle that in patch 4, where we'll know which value to expect.

+        || frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadBypassingCache);
 }
 
 TEST_F(WebFrameTest, BackDuringChildFrameReload)
@@ -4870,7 +4871,8 @@ TEST_F(WebFrameTest, ReloadPost)
     EXPECT_EQ(WebString::fromUTF8("POST"), frame->dataSource()->request().httpMethod());
 
     FrameTestHelpers::reloadFrame(frame);
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_TRUE(frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadIgnoringCacheData
+        || frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadBypassingCache);
     EXPECT_EQ(WebNavigationTypeFormResubmitted, frame->dataSource()->navigationType());
 }
 
@@ -4891,7 +4893,8 @@ TEST_F(WebFrameTest, LoadHistoryItemReload)
     // Cache policy overrides should take.
     FrameTestHelpers::loadHistoryItem(frame, WebHistoryItem(firstItem), WebHistoryDifferentDocumentLoad, WebURLRequest::ReloadIgnoringCacheData);
     EXPECT_EQ(firstItem.get(), mainFrameLoader.currentItem());
-    EXPECT_EQ(WebURLRequest::ReloadIgnoringCacheData, frame->dataSource()->request().cachePolicy());
+    EXPECT_TRUE(frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadIgnoringCacheData
+        || frame->dataSource()->request().cachePolicy() == WebURLRequest::ReloadBypassingCache);
 }
 
 
@@ -4979,7 +4982,8 @@ TEST_F(WebFrameTest, ReloadIframe)
 
     EXPECT_EQ(mainClient.childFrameCreationCount(), 2);
     EXPECT_EQ(childClient.willSendRequestCallCount(), 2);
-    EXPECT_EQ(childClient.cachePolicy(), WebURLRequest::ReloadIgnoringCacheData);
+    EXPECT_TRUE(childClient.cachePolicy() == WebURLRequest::ReloadIgnoringCacheData
+        || childClient.cachePolicy() == WebURLRequest::ReloadBypassingCache);
 }
 
 class TestSameDocumentWebFrameClient : public FrameTestHelpers::TestWebFrameClient {