Introduce WebCachePolicy to merge cache policy enums

content/renderer/internal_document_state_data.h

Index: content/renderer/internal_document_state_data.h
diff --git a/content/renderer/internal_document_state_data.h b/content/renderer/internal_document_state_data.h
index 23335a5d740a4e3049ac3b5a432c80117e1b1210..3963daeae34ab5098f7855f2a2551f5cfdd1fd91 100644
--- a/content/renderer/internal_document_state_data.h
+++ b/content/renderer/internal_document_state_data.h
@@ -10,11 +10,12 @@
 #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 {
@@ -61,17 +62,16 @@ class InternalDocumentStateData : public base::SupportsUserData::Data {
   // 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_;
@@ -87,7 +87,7 @@ class InternalDocumentStateData : public base::SupportsUserData::Data {
   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);
 };