Add the navigation redirect-chain to Sync sessions proto for offline analysis.

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"
@@ skipping 17 matching lines @@
 
 using std::string;
 
 namespace android_webview {
 
 namespace {
 
 // Sanity check value that we are restoring from a valid pickle.
 // This can potentially used as an actual serialization version number in the
 // future if we ever decide to support restoring from older versions.
-const uint32 AW_STATE_VERSION = 20130814;
+const uint32 AW_STATE_VERSION = 20140115;
 
 }  // namespace
 
 bool WriteToPickle(const content::WebContents& web_contents,
                    Pickle* pickle) {
   DCHECK(pickle);
 
   if (!internal::WriteHeaderToPickle(pickle))
     return false;
 
@@ skipping 133 matching lines @@
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetIsOverridingUserAgent())))
     return false;
 
   if (!pickle->WriteInt64(entry.GetTimestamp().ToInternalValue()))
     return false;
 
   if (!pickle->WriteInt(entry.GetHttpStatusCode()))
     return false;
 
+  // The redirect chain has a variable number of entries.
+  bool did_write_all_redirects = true;
+  if (!pickle->WriteUInt16(entry.GetRedirectChain().size()))
+    return false;
+  for (size_t i = 0; i < entry.GetRedirectChain().size(); i++) {
+    if (!pickle->WriteString(entry.GetRedirectChain().at(i).spec())) {
+      did_write_all_redirects = false;
+    }
+  }
+  if (!did_write_all_redirects)
+    return false;
+
   // Please update AW_STATE_VERSION if serialization format is changed.
 
   return true;
 }
 
 bool RestoreNavigationEntryFromPickle(PickleIterator* iterator,
                                       content::NavigationEntry* entry) {
   {
     string url;
     if (!iterator->ReadString(&url))
@@ skipping 73 matching lines @@
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
   {
     int http_status_code;
     if (!iterator->ReadInt(&http_status_code))
       return false;
     entry->SetHttpStatusCode(http_status_code);
   }
 
+  {
+    unsigned short redirect_chain_length = 0;
+    if (!iterator->ReadUInt16(&redirect_chain_length))
+      return false;
+    std::vector<GURL> full_redirect_chain;
+    bool was_full_chain_read_successfully = true;
+    for (size_t i = 0; i < redirect_chain_length; i++) {
+      std::string a_redirect;
+      if (!iterator->ReadString(&a_redirect)) {
+        was_full_chain_read_successfully = false;
+      } else {
+        full_redirect_chain.push_back(GURL(a_redirect));
+      }
+    }
+    if (was_full_chain_read_successfully) {
+      entry->SetRedirectChain(full_redirect_chain);
+    } else {
+      return false;
+    }
+  }
+
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview