[Sync] Add HTTP status codes to NavigationEntry and TabNavigation

chrome/browser/sessions/tab_restore_service_browsertest.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 "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/sessions/session_service.h"
 #include "chrome/browser/sessions/session_service_factory.h"
 #include "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/session_types_test_helper.h"
@@ skipping 522 matching lines @@
   std::vector<TabNavigation> old_navigations;
   {
     // |entry|/|tab| doesn't survive after RecreateService().
     TabRestoreService::Entry* entry = service_->entries().front();
     ASSERT_EQ(TabRestoreService::TAB, entry->type);
     Tab* tab = static_cast<Tab*>(entry);
     tab->timestamp = tab_timestamp;
     old_navigations = tab->navigations;
   }
 
-  ASSERT_EQ(3U, old_navigations.size());
-  EXPECT_FALSE(old_navigations[0].timestamp().is_null());
-  EXPECT_FALSE(old_navigations[1].timestamp().is_null());
-  EXPECT_FALSE(old_navigations[2].timestamp().is_null());
+  EXPECT_EQ(3U, old_navigations.size());
+  for (size_t i = 0; i < old_navigations.size(); ++i) {
+    EXPECT_FALSE(
+        SessionTypesTestHelper::GetTimestamp(old_navigations[i]).is_null());
+  }
 
   // Set this, otherwise previous session won't be loaded.
   profile()->set_last_session_exited_cleanly(false);
 
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
   // And verify the entry.
   TabRestoreService::Entry* restored_entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
   Tab* restored_tab =
       static_cast<Tab*>(restored_entry);
   EXPECT_EQ(tab_timestamp.ToInternalValue(),
             restored_tab->timestamp.ToInternalValue());
-  ASSERT_EQ(3U, restored_tab->navigations.size());
-  EXPECT_EQ(old_navigations[0].timestamp(),
-            restored_tab->navigations[0].timestamp());
-  EXPECT_EQ(old_navigations[1].timestamp(),
-            restored_tab->navigations[1].timestamp());
-  EXPECT_EQ(old_navigations[2].timestamp(),
-            restored_tab->navigations[2].timestamp());
+  ASSERT_EQ(old_navigations.size(), restored_tab->navigations.size());
+  for (size_t i = 0; i < restored_tab->navigations.size(); ++i) {
+    EXPECT_EQ(
+        SessionTypesTestHelper::GetTimestamp(old_navigations[i]),
+        SessionTypesTestHelper::GetTimestamp(restored_tab->navigations[i]));
+  }
+}
+
+// Makes sure we restore status codes correctly.
+TEST_F(TabRestoreServiceTest, StatusCodesSurviveRestore) {
+  AddThreeNavigations();
+
+  // Have the service record the tab.
+  service_->CreateHistoricalTab(contents(), -1);
+
+  // Make sure an entry was created.
+  ASSERT_EQ(1U, service_->entries().size());
+
+  // Make sure the entry matches.
+  std::vector<TabNavigation> old_navigations;
+  {
+    // |entry|/|tab| doesn't survive after RecreateService().
+    TabRestoreService::Entry* entry = service_->entries().front();
+    ASSERT_EQ(TabRestoreService::TAB, entry->type);
+    Tab* tab = static_cast<Tab*>(entry);
+    old_navigations = tab->navigations;
+  }
+
+  EXPECT_EQ(3U, old_navigations.size());
+  for (size_t i = 0; i < old_navigations.size(); ++i) {
+    EXPECT_EQ(200,
+              SessionTypesTestHelper::GetHttpStatusCode(old_navigations[i]));
+  }
+
+  // Set this, otherwise previous session won't be loaded.
+  profile()->set_last_session_exited_cleanly(false);
+
+  RecreateService();
+
+  // One entry should be created.
+  ASSERT_EQ(1U, service_->entries().size());
+
+  // And verify the entry.
+  TabRestoreService::Entry* restored_entry = service_->entries().front();
+  ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
+  Tab* restored_tab =
+      static_cast<Tab*>(restored_entry);
+  ASSERT_EQ(old_navigations.size(), restored_tab->navigations.size());
+  for (size_t i = 0; i < restored_tab->navigations.size(); ++i) {
+    EXPECT_EQ(200,
+              SessionTypesTestHelper::GetHttpStatusCode(
+                  restored_tab->navigations[i]));
+  }
 }
 
 TEST_F(TabRestoreServiceTest, PruneEntries) {
   service_->ClearEntries();
   ASSERT_TRUE(service_->entries().empty());
 
   const size_t max_entries = TabRestoreService::kMaxEntries;
   for (size_t i = 0; i < max_entries + 5; i++) {
     TabNavigation navigation =
         SessionTypesTestHelper::CreateNavigation(
@@ skipping 90 matching lines @@
   for (size_t i = 0; i < max_entries + 5; i++) {
     NavigateAndCommit(GURL(StringPrintf("http://%d", static_cast<int>(i))));
     service_->CreateHistoricalTab(contents(), -1);
   }
 
   EXPECT_EQ(max_entries, service_->entries_.size());
   // This should not crash.
   service_->LoadTabsFromLastSession();
   EXPECT_EQ(max_entries, service_->entries_.size());
 }