Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/Source/web/tests/WebViewTest.cpp

Index: third_party/WebKit/Source/web/tests/WebViewTest.cpp
diff --git a/third_party/WebKit/Source/web/tests/WebViewTest.cpp b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
index ff7a400e0e935159848636ea6c5efef7cbe106c8..c4b147af99aab4dee39d1f06d3a58591d61bad89 100644
--- a/third_party/WebKit/Source/web/tests/WebViewTest.cpp
+++ b/third_party/WebKit/Source/web/tests/WebViewTest.cpp
@@ -1277,16 +1277,13 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
 
     // Go back, then forward, then back again.
     mainFrameLocal->loader().load(
-        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
-            item1.get(), UseProtocolCachePolicy)),
+        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(item1.get(), WebCachePolicy::UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
-        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
-            item2.get(), UseProtocolCachePolicy)),
+        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(item2.get(), WebCachePolicy::UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item2.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
-        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
-            item1.get(), UseProtocolCachePolicy)),
+        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(item1.get(), WebCachePolicy::UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
 
     // Click a different anchor
@@ -1295,12 +1292,10 @@ TEST_F(WebViewTest, BackForwardRestoreScroll)
 
     // Go back, then forward. The scroll position should be properly set on the forward navigation.
     mainFrameLocal->loader().load(
-        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
-            item1.get(), UseProtocolCachePolicy)),
+        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(item1.get(), WebCachePolicy::UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item1.get(), HistorySameDocumentLoad);
     mainFrameLocal->loader().load(
-        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(
-            item3.get(), UseProtocolCachePolicy)),
+        FrameLoadRequest(nullptr, FrameLoader::resourceRequestFromHistoryItem(item3.get(), WebCachePolicy::UseProtocolCachePolicy)),
         FrameLoadTypeBackForward, item3.get(), HistorySameDocumentLoad);
     EXPECT_EQ(0, webViewImpl->mainFrame()->scrollOffset().width);
     EXPECT_GT(webViewImpl->mainFrame()->scrollOffset().height, 2000);