Fixes bug where first login attempt to hotmail after session restore...

chrome/browser/sessions/tab_restore_service_unittest.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/sessions/session_types.h"
 #include "chrome/browser/sessions/tab_restore_service.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "chrome/test/test_tab_contents.h"
 #include "chrome/test/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 161 matching lines @@
   service_->RestoreEntryById(NULL, service_->entries().front()->id, true);
   ASSERT_TRUE(service_->entries().empty());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // There should be no entries.
   ASSERT_EQ(0U, service_->entries().size());
 }
 
-// Make sure we don't persist entries to disk that have post data.
-TEST_F(TabRestoreServiceTest, DontPersistPostData1) {
+// Make sure we persist entries to disk that have post data.
+TEST_F(TabRestoreServiceTest, DontPersistPostData) {
   AddThreeNavigations();
+  controller_->GetEntryAtIndex(0)->set_has_post_data(true);
+  controller_->GetEntryAtIndex(1)->set_has_post_data(true);
   controller_->GetEntryAtIndex(2)->set_has_post_data(true);
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(controller_);
-  ASSERT_EQ(1U, service_->entries().size());
-
-  // Recreate the service and have it load the tabs.
-  RecreateService();
-
-  // One entry should be created.
-  ASSERT_EQ(1U, service_->entries().size());
-
-  // And verify the entry, the last navigation (url3_) should not have
-  // been written to disk as it contained post data.
-  TabRestoreService::Entry* entry = service_->entries().front();
-  ASSERT_EQ(TabRestoreService::TAB, entry->type);
-  TabRestoreService::Tab* tab = static_cast<TabRestoreService::Tab*>(entry);
-  ASSERT_EQ(2U, tab->navigations.size());
-  EXPECT_TRUE(url1_ == tab->navigations[0].url());
-  EXPECT_TRUE(url2_ == tab->navigations[1].url());
-  EXPECT_EQ(1, tab->current_navigation_index);
-}
-
-// Make sure we don't persist entries to disk that have post data. This
-// differs from DontPersistPostData1 in that all navigations before the
-// current index have post data.
-TEST_F(TabRestoreServiceTest, DontPersistPostData2) {
-  AddThreeNavigations();
-  NavigateToIndex(1);
-  controller_->GetEntryAtIndex(0)->set_has_post_data(true);
-  controller_->GetEntryAtIndex(1)->set_has_post_data(true);
-
-  // Have the service record the tab.
-  service_->CreateHistoricalTab(controller_);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
   RecreateService();
 
   // One entry should be created.
   ASSERT_EQ(1U, service_->entries().size());
 
-  // And verify the entry, the last navigation (url3_) should not have
-  // been written to disk as it contained post data.
-  TabRestoreService::Entry* entry = service_->entries().front();
-  ASSERT_EQ(TabRestoreService::TAB, entry->type);
-  TabRestoreService::Tab* tab = static_cast<TabRestoreService::Tab*>(entry);
-  ASSERT_EQ(1U, tab->navigations.size());
-  EXPECT_TRUE(url3_ == tab->navigations[0].url());
-  EXPECT_EQ(0, tab->current_navigation_index);
+  const TabRestoreService::Entry* restored_entry = service_->entries().front();
+  ASSERT_EQ(TabRestoreService::TAB, restored_entry->type);
+
+  const TabRestoreService::Tab* restored_tab =
+      static_cast<const TabRestoreService::Tab*>(restored_entry);
+  // There should be 3 navs.
+  ASSERT_EQ(3U, restored_tab->navigations.size());
 }
 
 // Make sure we don't persist entries to disk that have post data. This
-// differs from DontPersistPostData1 in that all the navigations have post
-// data, so that nothing should be persisted.
-TEST_F(TabRestoreServiceTest, DontPersistPostData3) {
-  AddThreeNavigations();
-  controller_->GetEntryAtIndex(0)->set_has_post_data(true);
-  controller_->GetEntryAtIndex(1)->set_has_post_data(true);
-  controller_->GetEntryAtIndex(2)->set_has_post_data(true);
-
-  // Have the service record the tab.
-  service_->CreateHistoricalTab(controller_);
-  ASSERT_EQ(1U, service_->entries().size());
-
-  // Recreate the service and have it load the tabs.
-  RecreateService();
-
-  // One entry should be created.
-  ASSERT_TRUE(service_->entries().empty());
-}
-
-// Make sure we don't persist entries to disk that have post data. This
 // differs from DontPersistPostData1 in that all the navigations have post
 // data, so that nothing should be persisted.
 TEST_F(TabRestoreServiceTest, DontLoadTwice) {
   AddThreeNavigations();
 
   // Have the service record the tab.
   service_->CreateHistoricalTab(controller_);
   ASSERT_EQ(1U, service_->entries().size());
 
   // Recreate the service and have it load the tabs.
@@ skipping 113 matching lines @@
   TabRestoreService::Entry* entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::WINDOW, entry->type);
   TabRestoreService::Window* window =
       static_cast<TabRestoreService::Window*>(entry);
   ASSERT_EQ(1U, window->tabs.size());
   EXPECT_EQ(0, window->selected_tab_index);
   ASSERT_EQ(1U, window->tabs[0].navigations.size());
   EXPECT_EQ(0, window->tabs[0].current_navigation_index);
   EXPECT_TRUE(url1_ == window->tabs[0].navigations[0].url());
 }