Changes session restore to use a normal load rather than preferring...

chrome/browser/tab_contents/navigation_entry_unittest.cc

 // Copyright (c) 2009 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/string16.h"
 #include "base/string_util.h"
 #include "chrome/browser/renderer_host/site_instance.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 156 matching lines @@
   entry2_.get()->set_transition_type(PageTransition::RELOAD);
   EXPECT_EQ(PageTransition::RELOAD, entry2_.get()->transition_type());
 
   // Post Data
   EXPECT_FALSE(entry1_.get()->has_post_data());
   EXPECT_FALSE(entry2_.get()->has_post_data());
   entry2_.get()->set_has_post_data(true);
   EXPECT_TRUE(entry2_.get()->has_post_data());
 
   // Restored
-  EXPECT_FALSE(entry1_.get()->restored());
-  EXPECT_FALSE(entry2_.get()->restored());
-  entry2_.get()->set_restored(true);
-  EXPECT_TRUE(entry2_.get()->restored());
+  EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry1_->restore_type());
+  EXPECT_EQ(NavigationEntry::RESTORE_NONE, entry2_->restore_type());
+  entry2_->set_restore_type(NavigationEntry::RESTORE_LAST_SESSION);
+  EXPECT_EQ(NavigationEntry::RESTORE_LAST_SESSION, entry2_->restore_type());
 }