[Search] No longer reverting omnibox text on instant search

chrome/browser/sessions/session_types_unittest.cc

Index: chrome/browser/sessions/session_types_unittest.cc
diff --git a/chrome/browser/sessions/session_types_unittest.cc b/chrome/browser/sessions/session_types_unittest.cc
index 801d4ae8808430d90cc22696dc37c13418bc2c41..0285eb06be83950a4abb407ba15be88dcafed6b2 100644
--- a/chrome/browser/sessions/session_types_unittest.cc
+++ b/chrome/browser/sessions/session_types_unittest.cc
@@ -32,6 +32,7 @@ const content::Referrer kReferrer =
                       WebKit::WebReferrerPolicyAlways);
 const GURL kVirtualURL("http://www.virtual-url.com");
 const string16 kTitle = ASCIIToUTF16("title");
+const string16 kSearchTerms = ASCIIToUTF16("my search terms");
 const std::string kContentState = "content state";
 const content::PageTransition kTransitionType =
     static_cast<content::PageTransition>(
@@ -60,6 +61,7 @@ scoped_ptr<content::NavigationEntry> MakeNavigationEntryForTest() {
   navigation_entry->SetOriginalRequestURL(kOriginalRequestURL);
   navigation_entry->SetIsOverridingUserAgent(kIsOverridingUserAgent);
   navigation_entry->SetTimestamp(kTimestamp);
+  navigation_entry->SetSearchTerms(kSearchTerms);
   return navigation_entry.Pass();
 }
 
@@ -76,6 +78,7 @@ sync_pb::TabNavigation MakeSyncDataForTest() {
   sync_data.set_timestamp(syncer::TimeToProtoTime(kTimestamp));
   sync_data.set_redirect_type(sync_pb::SyncEnums::CLIENT_REDIRECT);
   sync_data.set_navigation_home_page(true);
+  sync_data.set_search_terms(UTF16ToUTF8(kSearchTerms));
   return sync_data;
 }
 
@@ -98,6 +101,7 @@ TEST(TabNavigationTest, DefaultInitializer) {
   EXPECT_EQ(GURL(), SessionTypesTestHelper::GetOriginalRequestURL(navigation));
   EXPECT_FALSE(SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
   EXPECT_TRUE(SessionTypesTestHelper::GetTimestamp(navigation).is_null());
+  EXPECT_TRUE(navigation.search_terms().empty());
 }
 
 // Create a TabNavigation from a NavigationEntry.  All its fields
@@ -128,6 +132,7 @@ TEST(TabNavigationTest, FromNavigationEntry) {
   EXPECT_EQ(kIsOverridingUserAgent,
             SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
   EXPECT_EQ(kTimestamp, SessionTypesTestHelper::GetTimestamp(navigation));
+  EXPECT_EQ(kSearchTerms, navigation.search_terms());
 }
 
 // Create a TabNavigation from a sync_pb::TabNavigation.  All its
@@ -155,6 +160,7 @@ TEST(TabNavigationTest, FromSyncData) {
   EXPECT_EQ(GURL(), SessionTypesTestHelper::GetOriginalRequestURL(navigation));
   EXPECT_FALSE(SessionTypesTestHelper::GetIsOverridingUserAgent(navigation));
   EXPECT_TRUE(SessionTypesTestHelper::GetTimestamp(navigation).is_null());
+  EXPECT_EQ(kSearchTerms, navigation.search_terms());
 }
 
 // Create a TabNavigation, pickle it, then create another one by
@@ -191,6 +197,7 @@ TEST(TabNavigationTest, Pickle) {
   EXPECT_EQ(kIsOverridingUserAgent,
             SessionTypesTestHelper::GetIsOverridingUserAgent(new_navigation));
   EXPECT_EQ(kTimestamp, SessionTypesTestHelper::GetTimestamp(new_navigation));
+  EXPECT_EQ(kSearchTerms, new_navigation.search_terms());
 }
 
 // Create a NavigationEntry, then create another one by converting to
@@ -221,6 +228,7 @@ TEST(TabNavigationTest, ToNavigationEntry) {
             new_navigation_entry->GetOriginalRequestURL());
   EXPECT_EQ(kIsOverridingUserAgent,
             new_navigation_entry->GetIsOverridingUserAgent());
+  EXPECT_EQ(kSearchTerms, new_navigation_entry->GetSearchTerms());
 }
 
 // Create a NavigationEntry, convert it to a TabNavigation, then
@@ -245,6 +253,7 @@ TEST(TabNavigationTest, ToSyncData) {
   EXPECT_EQ(navigation_entry->GetUniqueID(), sync_data.unique_id());
   EXPECT_EQ(syncer::TimeToProtoTime(kTimestamp), sync_data.timestamp());
   EXPECT_EQ(kTimestamp.ToInternalValue(), sync_data.global_id());
+  EXPECT_EQ(kSearchTerms, ASCIIToUTF16(sync_data.search_terms()));
 }
 
 // Ensure all transition types and qualifiers are converted to/from the sync
@@ -296,6 +305,7 @@ TEST(SessionTab, FromSyncData) {
     navigation->set_referrer("referrer");
     navigation->set_title("title");
     navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
+    navigation->set_search_terms("my search terms");
   }
 
   SessionTab tab;
@@ -329,6 +339,8 @@ TEST(SessionTab, FromSyncData) {
               SessionTypesTestHelper::GetTransitionType(tab.navigations[i]));
     EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)),
               tab.navigations[i].virtual_url());
+    EXPECT_EQ(string16(ASCIIToUTF16("my search terms")),
+              tab.navigations[i].search_terms());
   }
   EXPECT_TRUE(tab.session_storage_persistent_id.empty());
 }
@@ -363,6 +375,8 @@ TEST(SessionTab, ToSyncData) {
               sync_data.navigation(i).virtual_url());
     EXPECT_EQ(UTF16ToUTF8(tab.navigations[i].title()),
               sync_data.navigation(i).title());
+    EXPECT_EQ(UTF16ToUTF8(tab.navigations[i].search_terms()),
+              sync_data.navigation(i).search_terms());
   }
   EXPECT_FALSE(sync_data.has_favicon());
   EXPECT_FALSE(sync_data.has_favicon_type());