Introduce WebCachePolicy to merge cache policy enums

content/renderer/internal_document_state_data.h

 // Copyright (c) 2013 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.
 
 #ifndef CONTENT_RENDERER_INTERNAL_DOCUMENT_STATE_DATA_H_
 #define CONTENT_RENDERER_INTERNAL_DOCUMENT_STATE_DATA_H_
 
 #include <string>
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/supports_user_data.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
+#include "third_party/WebKit/public/platform/WebCachePolicy.h"
 #include "url/gurl.h"
 
 namespace blink {
 class WebDataSource;
+enum class WebCachePolicy;
 }
 
 namespace content {
 
 class DocumentState;
 
 // Stores internal state per WebDataSource.
 class InternalDocumentStateData : public base::SupportsUserData::Data {
  public:
   InternalDocumentStateData();
@@ skipping 26 matching lines @@
   bool must_reset_scroll_and_scale_state() const {
     return must_reset_scroll_and_scale_state_;
   }
   void set_must_reset_scroll_and_scale_state(bool state) {
     must_reset_scroll_and_scale_state_ = state;
   }
 
   // Sets the cache policy. The cache policy is only used if explicitly set and
   // by default is not set. You can mark a NavigationState as not having a cache
   // state by way of clear_cache_policy_override.
-  void set_cache_policy_override(
-      blink::WebURLRequest::CachePolicy cache_policy) {
+  void set_cache_policy_override(blink::WebCachePolicy cache_policy) {
     cache_policy_override_ = cache_policy;
     cache_policy_override_set_ = true;
   }
-  blink::WebURLRequest::CachePolicy cache_policy_override() const {
+  blink::WebCachePolicy cache_policy_override() const {
     return cache_policy_override_;
   }
   void clear_cache_policy_override() {
     cache_policy_override_set_ = false;
-    cache_policy_override_ = blink::WebURLRequest::UseProtocolCachePolicy;
+    cache_policy_override_ = blink::WebCachePolicy::UseProtocolCachePolicy;
   }
   bool is_cache_policy_override_set() const {
     return cache_policy_override_set_;
   }
 
  protected:
   ~InternalDocumentStateData() override;
 
  private:
   int http_status_code_;
   GURL searchable_form_url_;
   std::string searchable_form_encoding_;
   bool is_overriding_user_agent_;
   bool must_reset_scroll_and_scale_state_;
   bool cache_policy_override_set_;
-  blink::WebURLRequest::CachePolicy cache_policy_override_;
+  blink::WebCachePolicy cache_policy_override_;
 
   DISALLOW_COPY_AND_ASSIGN(InternalDocumentStateData);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_INTERNAL_DOCUMENT_STATE_DATA_H_