Changes session restore to use a normal load rather than preferring...

chrome/renderer/navigation_state.h

 // Copyright (c) 2009 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 CHROME_RENDERER_NAVIGATION_STATE_H_
 #define CHROME_RENDERER_NAVIGATION_STATE_H_
 
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/common/page_transition_types.h"
 #include "webkit/api/public/WebDataSource.h"
+#include "webkit/api/public/WebURLRequest.h"
 #include "webkit/glue/alt_error_page_resource_fetcher.h"
 #include "webkit/glue/password_form.h"
 
 // The RenderView stores an instance of this class in the "extra data" of each
 // WebDataSource (see RenderView::DidCreateDataSource).
 class NavigationState : public WebKit::WebDataSource::ExtraData {
  public:
   static NavigationState* CreateBrowserInitiated(
       int32 pending_page_id,
       PageTransition::Type transition_type,
@@ skipping 133 matching lines @@
   void clear_postponed_data() {
     postponed_data_.clear();
   }
   void append_postponed_data(const char* data, size_t data_len) {
     postponed_data_.append(data, data_len);
   }
   const std::string& postponed_data() const {
     return postponed_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(
+      WebKit::WebURLRequest::CachePolicy cache_policy) {
+    cache_policy_override_ = cache_policy;
+    cache_policy_override_set_ = true;
+  }
+  WebKit::WebURLRequest::CachePolicy cache_policy_override() const {
+    return cache_policy_override_;
+  }
+  void clear_cache_policy_override() {
+    cache_policy_override_set_ = false;
+    cache_policy_override_ = WebKit::WebURLRequest::UseProtocolCachePolicy;
+  }
+  bool is_cache_policy_override_set() const {
+    return cache_policy_override_set_;
+  }
+
  private:
   NavigationState(PageTransition::Type transition_type,
                   const base::Time& request_time,
                   bool is_content_initiated,
                   int32 pending_page_id)
       : transition_type_(transition_type),
         request_time_(request_time),
         load_histograms_recorded_(false),
         request_committed_(false),
         is_content_initiated_(is_content_initiated),
         pending_page_id_(pending_page_id),
-        postpone_loading_data_(false) {
+        postpone_loading_data_(false),
+        cache_policy_override_set_(false),
+        cache_policy_override_(WebKit::WebURLRequest::UseProtocolCachePolicy) {
   }
 
   PageTransition::Type transition_type_;
   base::Time request_time_;
   base::Time start_load_time_;
   base::Time commit_load_time_;
   base::Time finish_document_load_time_;
   base::Time finish_load_time_;
   base::Time first_paint_time_;
   base::Time first_paint_after_load_time_;
   bool load_histograms_recorded_;
   bool request_committed_;
   bool is_content_initiated_;
   int32 pending_page_id_;
   GURL searchable_form_url_;
   std::string searchable_form_encoding_;
   scoped_ptr<webkit_glue::PasswordForm> password_form_data_;
   scoped_ptr<webkit_glue::AltErrorPageResourceFetcher> alt_error_page_fetcher_;
   std::string security_info_;
   bool postpone_loading_data_;
   std::string postponed_data_;
+  bool cache_policy_override_set_;
+  WebKit::WebURLRequest::CachePolicy cache_policy_override_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationState);
 };
 
 #endif  // CHROME_RENDERER_NAVIGATION_STATE_H_