Introduce WebCachePolicy to merge cache policy enums

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "core/frame/VisualViewport.h"
 
 #include "core/dom/Document.h"
 #include "core/frame/FrameHost.h"
 #include "core/frame/FrameView.h"
 #include "core/frame/LocalFrame.h"
 #include "core/html/HTMLBodyElement.h"
 #include "core/html/HTMLElement.h"
 #include "core/input/EventHandler.h"
 #include "core/layout/LayoutObject.h"
 #include "core/layout/api/LayoutViewItem.h"
 #include "core/layout/compositing/PaintLayerCompositor.h"
 #include "core/page/Page.h"
 #include "platform/PlatformGestureEvent.h"
 #include "platform/geometry/DoublePoint.h"
 #include "platform/geometry/DoubleRect.h"
 #include "platform/testing/URLTestHelpers.h"
 #include "public/platform/Platform.h"
+#include "public/platform/WebCachePolicy.h"
 #include "public/platform/WebLayerTreeView.h"
 #include "public/platform/WebURLLoaderMockFactory.h"
 #include "public/web/WebCache.h"
 #include "public/web/WebContextMenuData.h"
 #include "public/web/WebDocument.h"
 #include "public/web/WebFrameClient.h"
 #include "public/web/WebInputEvent.h"
 #include "public/web/WebScriptSource.h"
 #include "public/web/WebSettings.h"
 #include "public/web/WebViewClient.h"
@@ skipping 805 matching lines @@
 
     registerMockedHttpURLLoad("200-by-300.html");
 
     WebHistoryItem item;
     item.initialize();
     WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300.html"));
     item.setURLString(destinationURL.string());
     item.setVisualViewportScrollOffset(WebFloatPoint(100, 120));
     item.setPageScaleFactor(2);
 
-    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
+    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebCachePolicy::UseProtocolCachePolicy);
 
     VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();
     EXPECT_EQ(2, visualViewport.scale());
 
     EXPECT_FLOAT_POINT_EQ(FloatPoint(100, 120), visualViewport.visibleRect().location());
 }
 
 // Test restoring a HistoryItem without the visual viewport offset falls back to distributing
 // the scroll offset between the main frame and the visual viewport.
 TEST_F(VisualViewportTest, TestRestoredFromLegacyHistoryItem)
 {
     initializeWithDesktopSettings();
     webViewImpl()->resize(IntSize(100, 150));
 
     registerMockedHttpURLLoad("200-by-300-viewport.html");
 
     WebHistoryItem item;
     item.initialize();
     WebURL destinationURL(URLTestHelpers::toKURL(m_baseURL + "200-by-300-viewport.html"));
     item.setURLString(destinationURL.string());
     // (-1, -1) will be used if the HistoryItem is an older version prior to having
     // visual viewport scroll offset.
     item.setVisualViewportScrollOffset(WebFloatPoint(-1, -1));
     item.setScrollOffset(WebPoint(120, 180));
     item.setPageScaleFactor(2);
 
-    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebURLRequest::UseProtocolCachePolicy);
+    FrameTestHelpers::loadHistoryItem(webViewImpl()->mainFrame(), item, WebHistoryDifferentDocumentLoad, WebCachePolicy::UseProtocolCachePolicy);
 
     VisualViewport& visualViewport = frame()->page()->frameHost().visualViewport();
     EXPECT_EQ(2, visualViewport.scale());
     EXPECT_POINT_EQ(IntPoint(100, 150), frame()->view()->scrollPosition());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(20, 30), visualViewport.visibleRect().location());
 }
 
 // Test that navigation to a new page with a different sized main frame doesn't
 // clobber the history item's main frame scroll offset. crbug.com/371867
 TEST_P(ParameterizedVisualViewportTest, TestNavigateToSmallerFrameViewHistoryItemClobberBug)
@@ skipping 856 matching lines @@
     webViewImpl()->handleInputEvent(pinchUpdate);
 
     VisualViewport& visualViewport = webViewImpl()->page()->frameHost().visualViewport();
     FrameView& frameView = *webViewImpl()->mainFrameImpl()->frameView();
 
     EXPECT_FLOAT_POINT_EQ(FloatPoint(50, 50), visualViewport.location());
     EXPECT_FLOAT_POINT_EQ(FloatPoint(0, 0), frameView.scrollPositionDouble());
 }
 
 } // namespace