Rewrites SerializedNavigationEntry to not have any //content member variables.

components/sessions/serialized_navigation_entry.h

 // Copyright 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 COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_
 #define COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_
 
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "components/sessions/sessions_export.h"
 #include "content/public/common/page_state.h"

[marja, 2014/10/20 07:43:16]

These content/ includes can now be removed, right? (Or moved to the .cc)

[rohitrao (ping after 24h), 2014/10/20 13:24:49]

Moved to various .cc files as needed.

 #include "content/public/common/referrer.h"
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
 class Pickle;
 class PickleIterator;
 
 namespace content {
 class BrowserContext;
 class NavigationEntry;
@@ skipping 62 matching lines @@
 
   // The index in the NavigationController. This SerializedNavigationEntry is
   // valid only when the index is non-negative.
   int index() const { return index_; }
   void set_index(int index) { index_ = index; }
 
   // Accessors for some fields taken from NavigationEntry.
   int unique_id() const { return unique_id_; }
   const GURL& virtual_url() const { return virtual_url_; }
   const base::string16& title() const { return title_; }
-  const content::PageState& page_state() const { return page_state_; }
+  const std::string& encoded_page_state() const { return encoded_page_state_; }
   const base::string16& search_terms() const { return search_terms_; }
   const GURL& favicon_url() const { return favicon_url_; }
   int http_status_code() const { return http_status_code_; }
-  const content::Referrer& referrer() const { return referrer_; }
+  const GURL& referrer_url() const { return referrer_url_; }
+  int referrer_policy() const { return referrer_policy_; }
   ui::PageTransition transition_type() const {
     return transition_type_;
   }
   bool has_post_data() const { return has_post_data_; }
   int64 post_id() const { return post_id_; }
   const GURL& original_request_url() const { return original_request_url_; }
   bool is_overriding_user_agent() const { return is_overriding_user_agent_; }
   base::Time timestamp() const { return timestamp_; }
 
   BlockedState blocked_state() { return blocked_state_; }
@@ skipping 12 matching lines @@
   // Converts a set of SerializedNavigationEntrys into a list of
   // NavigationEntrys with sequential page IDs and the given context. The caller
   // owns the returned NavigationEntrys.
   static std::vector<content::NavigationEntry*> ToNavigationEntries(
       const std::vector<SerializedNavigationEntry>& navigations,
       content::BrowserContext* browser_context);
 
  private:
   friend class SerializedNavigationEntryTestHelper;
 
+  // Returns the default referrer policy.
+  int GetDefaultReferrerPolicy() const;
+
+  // Returns a sanitized version of |encoded_page_state_| suitable for writing
+  // to disk.
+  std::string GetSanitizedPageStateForPickle() const;
+
   // Sanitizes the data in this class to be more robust against faulty data
   // written by older versions.
   void Sanitize();
 
   // Index in the NavigationController.
   int index_;
 
   // Member variables corresponding to NavigationEntry fields.
   int unique_id_;
-  content::Referrer referrer_;
+  GURL referrer_url_;
+  int referrer_policy_;
   GURL virtual_url_;
   base::string16 title_;
-  content::PageState page_state_;
+  std::string encoded_page_state_;
   ui::PageTransition transition_type_;
   bool has_post_data_;
   int64 post_id_;
   GURL original_request_url_;
   bool is_overriding_user_agent_;
   base::Time timestamp_;
   base::string16 search_terms_;
   GURL favicon_url_;
   int http_status_code_;
   bool is_restored_;    // Not persisted.
   std::vector<GURL> redirect_chain_;  // Not persisted.
 
   // Additional information.
   BlockedState blocked_state_;
   std::set<std::string> content_pack_categories_;
 };
 
 }  // namespace sessions
 
 #endif  // COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_