Fix user agent override restore pipeline

chrome/browser/sessions/tab_restore_service_browsertest.cc

Index: chrome/browser/sessions/tab_restore_service_browsertest.cc
diff --git a/chrome/browser/sessions/tab_restore_service_browsertest.cc b/chrome/browser/sessions/tab_restore_service_browsertest.cc
index 9aa06c8fc21f34f848f703b3f3d14692734001a6..b42d426dc183f8b4186001c72b021215d31dd1e3 100644
--- a/chrome/browser/sessions/tab_restore_service_browsertest.cc
+++ b/chrome/browser/sessions/tab_restore_service_browsertest.cc
@@ -20,6 +20,7 @@
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
+#include "content/public/browser/web_contents.h"
 #include "content/public/test/render_view_test.h"
 #include "content/public/test/test_utils.h"
 #include "content/public/test/web_contents_tester.h"
@@ -54,6 +55,7 @@ class TabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
     url1_ = GURL("http://1");
     url2_ = GURL("http://2");
     url3_ = GURL("http://3");
+    user_agent_override_ = "user_agent_override";
   }
 
   ~TabRestoreServiceTest() {
@@ -136,6 +138,7 @@ class TabRestoreServiceTest : public ChromeRenderViewHostTestHarness {
   GURL url1_;
   GURL url2_;
   GURL url3_;
+  std::string user_agent_override_;
   scoped_ptr<TabRestoreService> service_;
   TabRestoreTimeFactory* time_factory_;
   content::RenderViewTest::RendererWebKitPlatformSupportImplNoSandbox
@@ -161,19 +164,21 @@ TEST_F(TabRestoreServiceTest, Basic) {
   EXPECT_TRUE(url1_ == tab->navigations[0].virtual_url());
   EXPECT_TRUE(url2_ == tab->navigations[1].virtual_url());
   EXPECT_TRUE(url3_ == tab->navigations[2].virtual_url());
+  EXPECT_TRUE("" == tab->user_agent_override);

[sky, 2012/08/14 00:05:46]

EXPECT_EQ

[gone, 2012/08/14 01:03:22]

Done.

   EXPECT_EQ(2, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());
 
   NavigateToIndex(1);
 
-  // And check again.
+  // And check again, but set the user agent override this time.
+  contents()->SetUserAgentOverride(user_agent_override_);
   service_->CreateHistoricalTab(&controller(), -1);
 
   // There should be two entries now.
   ASSERT_EQ(2U, service_->entries().size());
 
-  // Make sure the entry matches
+  // Make sure the entry matches.
   entry = service_->entries().front();
   ASSERT_EQ(TabRestoreService::TAB, entry->type);
   tab = static_cast<Tab*>(entry);
@@ -182,6 +187,7 @@ TEST_F(TabRestoreServiceTest, Basic) {
   EXPECT_EQ(url1_, tab->navigations[0].virtual_url());
   EXPECT_EQ(url2_, tab->navigations[1].virtual_url());
   EXPECT_EQ(url3_, tab->navigations[2].virtual_url());
+  EXPECT_TRUE(user_agent_override_ == tab->user_agent_override);

[sky, 2012/08/14 00:05:46]

EXPECT_EQ

[gone, 2012/08/14 01:03:22]

Done.

   EXPECT_EQ(1, tab->current_navigation_index);
   EXPECT_EQ(time_factory_->TimeNow().ToInternalValue(),
             tab->timestamp.ToInternalValue());