Introduce content::PageState (again).

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/string16.h"
 #include "base/time.h"
 #include "components/sessions/sessions_export.h"
+#include "content/public/common/page_state.h"
 #include "content/public/common/page_transition_types.h"
 #include "content/public/common/referrer.h"
 #include "googleurl/src/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 string16& title() const { return title_; }
-  const std::string& content_state() const { return content_state_; }
+  const content::PageState& page_state() const { return page_state_; }
   const string16& search_terms() const { return search_terms_; }
   const GURL& favicon_url() const { return favicon_url_; }
   const content::Referrer& referrer() const { return referrer_; }
   content::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_; }
@@ skipping 22 matching lines @@
   friend class SerializedNavigationEntryTestHelper;
 
   // Index in the NavigationController.
   int index_;
 
   // Member variables corresponding to NavigationEntry fields.
   int unique_id_;
   content::Referrer referrer_;
   GURL virtual_url_;
   string16 title_;
-  std::string content_state_;
+  content::PageState page_state_;
   content::PageTransition transition_type_;
   bool has_post_data_;
   int64 post_id_;
   GURL original_request_url_;
   bool is_overriding_user_agent_;
   base::Time timestamp_;
   string16 search_terms_;
   GURL favicon_url_;
 
   // Additional information.
   BlockedState blocked_state_;
   std::set<std::string> content_pack_categories_;
 };
 
 }  // namespace sessions
 
 #endif  // COMPONENTS_SESSIONS_SERIALIZED_NAVIGATION_ENTRY_H_