Introduce WebCachePolicy to merge cache policy enums

third_party/WebKit/Source/web/WebLocalFrameImpl.h

 /*
  * Copyright (C) 2009 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 @@
         v8::Local<v8::Function>,
         v8::Local<v8::Value>,
         int argc,
         v8::Local<v8::Value> argv[]) override;
     v8::Local<v8::Context> mainWorldScriptContext() const override;
     void reload(bool ignoreCache) override;
     void reloadWithOverrideURL(const WebURL& overrideUrl, bool ignoreCache) override;
     void reloadImage(const WebNode&) override;
     void reloadLoFiImages() override;
     void loadRequest(const WebURLRequest&) override;
-    void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebURLRequest::CachePolicy) override;
+    void loadHistoryItem(const WebHistoryItem&, WebHistoryLoadType, WebCachePolicy) override;
     void loadHTMLString(
         const WebData& html, const WebURL& baseURL, const WebURL& unreachableURL,
         bool replace) override;
     void stopLoading() override;
     WebDataSource* provisionalDataSource() const override;
     WebDataSource* dataSource() const override;
     void enableViewSourceMode(bool enable) override;
     bool isViewSourceModeEnabled() const override;
     void setReferrerForRequest(WebURLRequest&, const WebURL& referrer) override;
     void dispatchWillSendRequest(WebURLRequest&) override;
@@ skipping 66 matching lines @@
     // WebLocalFrame methods:
     void setAutofillClient(WebAutofillClient*) override;
     WebAutofillClient* autofillClient() override;
     void setDevToolsAgentClient(WebDevToolsAgentClient*) override;
     WebDevToolsAgent* devToolsAgent() override;
     void setFrameOwnerProperties(const WebFrameOwnerProperties&) override;
     WebLocalFrameImpl* localRoot() override;
     WebLocalFrame* traversePreviousLocal(bool wrap) const override;
     WebLocalFrame* traverseNextLocal(bool wrap) const override;
     void sendPings(const WebNode& contextNode, const WebURL& destinationURL) override;
-    WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebURLRequest::CachePolicy)
-        const override;
+    WebURLRequest requestFromHistoryItem(const WebHistoryItem&, WebCachePolicy) const override;
     WebURLRequest requestForReload(WebFrameLoadType, const WebURL&) const override;
     void load(const WebURLRequest&, WebFrameLoadType, const WebHistoryItem&,
         WebHistoryLoadType, bool isClientRedirect) override;
     void loadData(
         const WebData&, const WebString& mimeType, const WebString& textEncoding,
         const WebURL& baseURL, const WebURL& unreachableURL, bool replace, WebFrameLoadType,
         const WebHistoryItem&, WebHistoryLoadType, bool isClientRedirect) override;
     bool isLoading() const override;
     bool isResourceLoadInProgress() const override;
     bool isNavigationScheduledWithin(double interval) const override;
@@ skipping 179 matching lines @@
     // cleared upon close().
     SelfKeepAlive<WebLocalFrameImpl> m_selfKeepAlive;
 #endif
 };
 
 DEFINE_TYPE_CASTS(WebLocalFrameImpl, WebFrame, frame, frame->isWebLocalFrame(), frame.isWebLocalFrame());
 
 } // namespace blink
 
 #endif