Move redirect_chain from NavigationEntry to FrameNavigationEntry.

components/sessions/content/content_serialized_navigation_builder_unittest.cc

 // Copyright 2014 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/content/content_serialized_navigation_builder.h"
 
 #include "components/sessions/content/content_record_password_state.h"
 #include "components/sessions/core/serialized_navigation_entry.h"
 #include "components/sessions/core/serialized_navigation_entry_test_helper.h"
 #include "content/public/browser/favicon_status.h"
@@ skipping 27 matching lines @@
                                  test_data::kSearchTerms);
   SetPasswordStateInNavigation(test_data::kPasswordState,
                                navigation_entry.get());
   navigation_entry->GetFavicon().valid = true;
   navigation_entry->GetFavicon().url = test_data::kFaviconURL;
   navigation_entry->SetHttpStatusCode(test_data::kHttpStatusCode);
   std::vector<GURL> redirect_chain;
   redirect_chain.push_back(test_data::kRedirectURL0);
   redirect_chain.push_back(test_data::kRedirectURL1);
   redirect_chain.push_back(test_data::kVirtualURL);
-  navigation_entry->SetRedirectChain(redirect_chain);
+  navigation_entry->SetMainFrameRedirectChain(redirect_chain);
   return navigation_entry;
 }
 
 }  // namespace
 
 
 // Create a SerializedNavigationEntry from a NavigationEntry.  All its fields
 // should match the NavigationEntry's.
 TEST(ContentSerializedNavigationBuilderTest, FromNavigationEntry) {
   const std::unique_ptr<content::NavigationEntry> navigation_entry(
@@ skipping 58 matching lines @@
   EXPECT_EQ(test_data::kPostID, new_navigation_entry->GetPostID());
   EXPECT_EQ(test_data::kOriginalRequestURL,
             new_navigation_entry->GetOriginalRequestURL());
   EXPECT_EQ(test_data::kIsOverridingUserAgent,
             new_navigation_entry->GetIsOverridingUserAgent());
   base::string16 search_terms;
   new_navigation_entry->GetExtraData(kSearchTermsKey, &search_terms);
   EXPECT_EQ(test_data::kSearchTerms, search_terms);
   EXPECT_EQ(test_data::kHttpStatusCode,
             new_navigation_entry->GetHttpStatusCode());
-  ASSERT_EQ(3U, new_navigation_entry->GetRedirectChain().size());
+  ASSERT_EQ(3U, new_navigation_entry->GetMainFrameRedirectChain().size());
   EXPECT_EQ(test_data::kRedirectURL0,
-            new_navigation_entry->GetRedirectChain()[0]);
+            new_navigation_entry->GetMainFrameRedirectChain()[0]);
   EXPECT_EQ(test_data::kRedirectURL1,
-            new_navigation_entry->GetRedirectChain()[1]);
+            new_navigation_entry->GetMainFrameRedirectChain()[1]);
   EXPECT_EQ(test_data::kVirtualURL,
-            new_navigation_entry->GetRedirectChain()[2]);
+            new_navigation_entry->GetMainFrameRedirectChain()[2]);
 }
 
 TEST(ContentSerializedNavigationBuilderTest, SetPasswordState) {
   std::unique_ptr<content::NavigationEntry> entry(
       content::NavigationEntry::Create());
 
   EXPECT_EQ(SerializedNavigationEntry::PASSWORD_STATE_UNKNOWN,
             GetPasswordStateFromNavigation(*entry));
   SetPasswordStateInNavigation(SerializedNavigationEntry::NO_PASSWORD_FIELD,
                                entry.get());
   EXPECT_EQ(SerializedNavigationEntry::NO_PASSWORD_FIELD,
             GetPasswordStateFromNavigation(*entry));
 }
 
 }  // namespace sessions