Introduce content::PageState (again).

android_webview/native/state_serializer.cc

 // Copyright (c) 2012 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.
 
 #include "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
 #include "base/time.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/page_state.h"
 
 // Reasons for not re-using TabNavigation under chrome/ as of 20121116:
 // * Android WebView has different requirements for fields to store since
 //   we are the only ones using values like BaseURLForDataURL.
 // * TabNavigation does unnecessary copying of data, which in Android
 //   WebView case, is undesired since save/restore is called in Android
 //   very frequently.
 // * TabNavigation is tightly integrated with the rest of chrome session
 //   restore and sync code, and has other purpose in addition to serializing
 //   NavigationEntry.
@@ skipping 114 matching lines @@
 
   const content::Referrer& referrer = entry.GetReferrer();
   if (!pickle->WriteString(referrer.url.spec()))
     return false;
   if (!pickle->WriteInt(static_cast<int>(referrer.policy)))
     return false;
 
   if (!pickle->WriteString16(entry.GetTitle()))
     return false;
 
-  if (!pickle->WriteString(entry.GetContentState()))
+  if (!pickle->WriteString(entry.GetPageState().ToEncodedData()))

[joth, 2013/05/28 22:04:34]

does the alter the format it is written out to the pickle as? If so, pleae could
you bump AW_STATE_VERSION => 20130528?

     return false;
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetHasPostData())))
     return false;
 
   if (!pickle->WriteString(entry.GetOriginalRequestURL().spec()))
     return false;
 
   if (!pickle->WriteString(entry.GetBaseURLForDataURL().spec()))
     return false;
@@ skipping 44 matching lines @@
     string16 title;
     if (!iterator->ReadString16(&title))
       return false;
     entry->SetTitle(title);
   }
 
   {
     string content_state;
     if (!iterator->ReadString(&content_state))
       return false;
-    entry->SetContentState(content_state);
+    entry->SetPageState(
+        content::PageState::CreateFromEncodedData(content_state));

[joth, 2013/05/28 22:59:44]

latent question.... what if |content_state| is bogus and so the constructed
PageState::IsValid() will return false?
- I think we should detect it and bail out with a 'return false' here?
- That would mean the //DHCECK(IsValid()) you have commented out in the
PageState c'tor could never be enforced - least we make an untestable code path
here.
- Or we could have CreateFromPossiblyInvalidEndedData() factory method? hmm.

(Receiving bogus data here is plausible, if highly unlikely, as the state is
handed over to embedding app to persist and return to us.)

   }
 
   {
     bool has_post_data;
     if (!iterator->ReadBool(&has_post_data))
       return false;
     entry->SetHasPostData(has_post_data);
   }
 
   {
@@ skipping 23 matching lines @@
       return false;
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview