[Sync] Add HTTP status codes to NavigationEntry and TabNavigation

chrome/browser/sessions/session_restore_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/command_line.h"
 #include "base/file_path.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/defaults.h"
@@ skipping 240 matching lines @@
 
   // And the first url should be url.
   EXPECT_EQ(url, chrome::GetWebContentsAt(new_browser, 0)->GetURL());
 }
 #endif  // !OS_CHROMEOS
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, RestoreIndividualTabFromWindow) {
   GURL url1(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title1.html"))));
-  GURL url2(ui_test_utils::GetTestUrl(
-      FilePath(FilePath::kCurrentDirectory),
-      FilePath(FILE_PATH_LITERAL("title2.html"))));
+  GURL url2("about:version");
   GURL url3(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title3.html"))));
 
   // Add and navigate three tabs.
   ui_test_utils::NavigateToURL(browser(), url1);
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
@@ skipping 19 matching lines @@
   // Expect a window with three tabs.
   ASSERT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
   const TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(service->entries().front());
   EXPECT_EQ(3U, window->tabs.size());
 
   // Find the SessionID for entry2. Since the session service was destroyed,
   // there is no guarantee that the SessionID for the tab has remained the same.
   base::Time timestamp;
+  int http_status_code = 0;
   for (std::vector<TabRestoreService::Tab>::const_iterator it =
            window->tabs.begin(); it != window->tabs.end(); ++it) {
     const TabRestoreService::Tab& tab = *it;
     // If this tab held url2, then restore this single tab.
     if (tab.navigations[0].virtual_url() == url2) {
-      timestamp = tab.navigations[0].timestamp();
+      timestamp = SessionTypesTestHelper::GetTimestamp(tab.navigations[0]);
+      http_status_code =
+          SessionTypesTestHelper::GetHttpStatusCode(tab.navigations[0]);
       service->RestoreEntryById(NULL, tab.id, UNKNOWN);
       break;
     }
   }
   EXPECT_FALSE(timestamp.is_null());
+  EXPECT_EQ(200, http_status_code);
 
   // Make sure that the restored tab is removed from the service.
   ASSERT_EQ(1U, service->entries().size());
   ASSERT_EQ(TabRestoreService::WINDOW, service->entries().front()->type);
   window = static_cast<TabRestoreService::Window*>(service->entries().front());
   EXPECT_EQ(2U, window->tabs.size());
 
   // Make sure that the restored tab was restored with the correct
-  // timestamp.
+  // timestamp and status code.
   const content::WebContents* contents =
       chrome::GetActiveWebContents(browser());
   ASSERT_TRUE(contents);
   const content::NavigationEntry* entry =
       contents->GetController().GetActiveEntry();
   ASSERT_TRUE(entry);
   EXPECT_EQ(timestamp, entry->GetTimestamp());
+  EXPECT_EQ(http_status_code, entry->GetHttpStatusCode());
 }
 
 IN_PROC_BROWSER_TEST_F(SessionRestoreTest, WindowWithOneTab) {
   GURL url(ui_test_utils::GetTestUrl(
       FilePath(FilePath::kCurrentDirectory),
       FilePath(FILE_PATH_LITERAL("title1.html"))));
 
   // Add a single tab.
   ui_test_utils::NavigateToURL(browser(), url);
 
@@ skipping 81 matching lines @@
   // Set up the restore data.
   sync_pb::SessionTab sync_data;
   sync_data.set_tab_visual_index(0);
   sync_data.set_current_navigation_index(1);
   sync_data.set_pinned(false);
   sync_data.add_navigation()->CopyFrom(nav1.ToSyncData());
   sync_data.add_navigation()->CopyFrom(nav2.ToSyncData());
 
   SessionTab tab;
   tab.SetFromSyncData(sync_data, base::Time::Now());
-  ASSERT_EQ(2U, tab.navigations.size());
-  EXPECT_TRUE(tab.navigations[0].timestamp().is_null());
-  EXPECT_TRUE(tab.navigations[1].timestamp().is_null());
+  EXPECT_EQ(2U, tab.navigations.size());
+  for (size_t i = 0; i < tab.navigations.size(); ++i) {
+    EXPECT_TRUE(
+        SessionTypesTestHelper::GetTimestamp(tab.navigations[i]).is_null());
+  }
 
   ASSERT_EQ(1, browser()->tab_count());
 
   // Restore in the current tab.
   {
     content::WindowedNotificationObserver observer(
         content::NOTIFICATION_LOAD_STOP,
         content::NotificationService::AllSources());
     SessionRestore::RestoreForeignSessionTab(
         chrome::GetActiveWebContents(browser()), tab, CURRENT_TAB);
@@ skipping 480 matching lines @@
   content::NavigationController* controller =
       &chrome::GetActiveWebContents(browser())->GetController();
   EXPECT_TRUE(
       controller->GetDefaultSessionStorageNamespace()->should_persist());
 
   // Quit and restore. Check that no extra tabs were created.
   Browser* new_browser = QuitBrowserAndRestore(browser(), 1);
   ASSERT_EQ(1u, BrowserList::size());
   EXPECT_EQ(1, new_browser->tab_strip_model()->count());
 }