Introduce WebCachePolicy to merge cache policy enums

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

 /*
  * Copyright (C) 2011 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 109 matching lines @@
     frame->loadRequest(urlRequest);
     pumpPendingRequestsForFrameToLoad(frame);
 }
 
 void loadHTMLString(WebFrame* frame, const std::string& html, const WebURL& baseURL)
 {
     frame->loadHTMLString(WebData(html.data(), html.size()), baseURL);
     pumpPendingRequestsForFrameToLoad(frame);
 }
 
-void loadHistoryItem(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoadType loadType, WebURLRequest::CachePolicy cachePolicy)
+void loadHistoryItem(WebFrame* frame, const WebHistoryItem& item, WebHistoryLoadType loadType, WebCachePolicy cachePolicy)
 {
     frame->loadHistoryItem(item, loadType, cachePolicy);
     pumpPendingRequestsForFrameToLoad(frame);
 }
 
 void reloadFrame(WebFrame* frame)
 {
     frame->reload(WebFrameLoadType::Reload);
     pumpPendingRequestsForFrameToLoad(frame);
 }
@@ skipping 160 matching lines @@
     m_frame->close();
 }
 
 void TestWebViewClient::initializeLayerTreeView()
 {
     m_layerTreeView = adoptPtr(new WebLayerTreeViewImplForTesting);
 }
 
 } // namespace FrameTestHelpers
 } // namespace blink