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

components/sessions/serialized_navigation_entry.cc

 // 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.
 
 #include "components/sessions/serialized_navigation_entry.h"
 
 #include "base/pickle.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/navigation_controller.h"
@@ skipping 39 matching lines @@
   navigation.is_overriding_user_agent_ = entry.GetIsOverridingUserAgent();
   navigation.timestamp_ = entry.GetTimestamp();
   navigation.is_restored_ = entry.IsRestored();
   // If you want to navigate a named frame in Chrome, you will first need to
   // add support for persisting it. It is currently only used for layout tests.
   CHECK(entry.GetFrameToNavigate().empty());
   entry.GetExtraData(kSearchTermsKey, &navigation.search_terms_);
   if (entry.GetFavicon().valid)
     navigation.favicon_url_ = entry.GetFavicon().url;
   navigation.http_status_code_ = entry.GetHttpStatusCode();
+  navigation.redirect_chain_ = entry.GetRedirectChain();
 
   return navigation;
 }
 
 SerializedNavigationEntry SerializedNavigationEntry::FromSyncData(
     int index,
     const sync_pb::TabNavigation& sync_data) {
   SerializedNavigationEntry navigation;
   navigation.index_ = index;
   navigation.unique_id_ = sync_data.unique_id();
@@ skipping 286 matching lines @@
   entry->SetTitle(title_);
   entry->SetPageState(page_state_);
   entry->SetPageID(page_id);
   entry->SetHasPostData(has_post_data_);
   entry->SetPostID(post_id_);
   entry->SetOriginalRequestURL(original_request_url_);
   entry->SetIsOverridingUserAgent(is_overriding_user_agent_);
   entry->SetTimestamp(timestamp_);
   entry->SetExtraData(kSearchTermsKey, search_terms_);
   entry->SetHttpStatusCode(http_status_code_);
+  entry->SetRedirectChain(redirect_chain_);
 
   // These fields should have default values.
   DCHECK_EQ(STATE_INVALID, blocked_state_);
   DCHECK_EQ(0u, content_pack_categories_.size());
 
   return entry.Pass();
 }
 
 // TODO(zea): perhaps sync state (scroll position, form entries, etc.) as well?
 // See http://crbug.com/67068.
@@ skipping 94 matching lines @@
     sync_data.set_blocked_state(
         static_cast<sync_pb::TabNavigation_BlockedState>(blocked_state_));
   }
 
   for (std::set<std::string>::const_iterator it =
            content_pack_categories_.begin();
        it != content_pack_categories_.end(); ++it) {
     sync_data.add_content_pack_categories(*it);
   }
 
+  // Copy all redirect chain entries except the last URL (which should match
+  // the virtual_url).
+  if (redirect_chain_.size() > 1) {  // Single entry chains have no redirection.
+    size_t last_entry = redirect_chain_.size() - 1;
+    for (size_t i = 0; i < last_entry; i++) {
+      sync_pb::NavigationRedirect* navigation_redirect =
+          sync_data.add_navigation_redirect();
+      navigation_redirect->set_url(redirect_chain_[i].spec());
+    }
+    // If the last URL didn't match the virtual_url, record it separately.
+    if (sync_data.virtual_url() != redirect_chain_[last_entry].spec()) {
+      sync_data.set_last_navigation_redirect_url(
+          redirect_chain_[last_entry].spec());
+    }
+  }
+
   sync_data.set_is_restored(is_restored_);
 
   return sync_data;
 }
 
 // static
 std::vector<NavigationEntry*> SerializedNavigationEntry::ToNavigationEntries(
     const std::vector<SerializedNavigationEntry>& navigations,
     content::BrowserContext* browser_context) {
   int page_id = 0;
@@ skipping 33 matching lines @@
   }
 
   if (referrer_.url != old_referrer.url ||
       referrer_.policy != old_referrer.policy) {
     referrer_ = content::Referrer();
     page_state_ = page_state_.RemoveReferrer();
   }
 }
 
 }  // namespace sessions