Introduce WebCachePolicy to merge cache policy enums

content/renderer/history_controller.h

 // 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.
 
 /*
  * Copyright (C) 2006, 2007, 2008, 2009 Apple Inc. All rights reserved.
  * Copyright (C) 2008, 2009 Torch Mobile Inc. All rights reserved.
  *     (http://www.torchmobile.com/)
  *
  * Redistribution and use in source and binary forms, with or without
@@ skipping 24 matching lines @@
 #ifndef CONTENT_RENDERER_HISTORY_CONTROLLER_H_
 #define CONTENT_RENDERER_HISTORY_CONTROLLER_H_
 
 #include <utility>
 
 #include "base/containers/hash_tables.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/common/content_export.h"
 #include "content/renderer/history_entry.h"
-#include "third_party/WebKit/public/platform/WebURLRequest.h"
 #include "third_party/WebKit/public/web/WebHistoryCommitType.h"
 #include "third_party/WebKit/public/web/WebHistoryItem.h"
 
 namespace blink {
 class WebFrame;
 class WebLocalFrame;
+enum class WebCachePolicy;
 }
 
 namespace content {
 class RenderFrameImpl;
 class RenderViewImpl;
 struct NavigationParams;
 
 // A guide to history state in the renderer:
 //
 // HistoryController: Owned by RenderView, is the entry point for interacting
@@ skipping 53 matching lines @@
 
   void set_provisional_entry(scoped_ptr<HistoryEntry> entry) {
     provisional_entry_ = std::move(entry);
   }
 
   // Return true if the main frame ended up loading a request as part of the
   // history navigation.
   bool GoToEntry(blink::WebLocalFrame* main_frame,
                  scoped_ptr<HistoryEntry> entry,
                  scoped_ptr<NavigationParams> navigation_params,
-                 blink::WebURLRequest::CachePolicy cache_policy);
+                 blink::WebCachePolicy cache_policy);
 
   void UpdateForCommit(RenderFrameImpl* frame,
                        const blink::WebHistoryItem& item,
                        blink::WebHistoryCommitType commit_type,
                        bool navigation_within_page);
 
   HistoryEntry* GetCurrentEntry();
   blink::WebHistoryItem GetItemForNewChildFrame(RenderFrameImpl* frame) const;
   void RemoveChildrenForRedirect(RenderFrameImpl* frame);
 
@@ skipping 23 matching lines @@
   // passed into frames created after the commit that resulted from the
   // navigation in GetItemForNewChildFrame().
   scoped_ptr<NavigationParams> navigation_params_;
 
   DISALLOW_COPY_AND_ASSIGN(HistoryController);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_HISTORY_CONTROLLER_H_