[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..2fc7b76e3dfc027641cce87fee5038a2955702d0 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>(
@@ -53,6 +54,7 @@ scoped_ptr<content::NavigationEntry> MakeNavigationEntryForTest() {
   navigation_entry->SetReferrer(kReferrer);
   navigation_entry->SetVirtualURL(kVirtualURL);
   navigation_entry->SetTitle(kTitle);
+  navigation_entry->SetSearchTerms(kSearchTerms);
   navigation_entry->SetContentState(kContentState);
   navigation_entry->SetTransitionType(kTransitionType);
   navigation_entry->SetHasPostData(kHasPostData);
@@ -69,6 +71,7 @@ sync_pb::TabNavigation MakeSyncDataForTest() {
   sync_data.set_virtual_url(kVirtualURL.spec());
   sync_data.set_referrer(kReferrer.url.spec());
   sync_data.set_title(UTF16ToUTF8(kTitle));
+  sync_data.set_search_terms(UTF16ToUTF8(kSearchTerms));
   sync_data.set_state(kContentState);
   sync_data.set_page_transition(
       sync_pb::SyncEnums_PageTransition_AUTO_SUBFRAME);
@@ -90,6 +93,7 @@ TEST(TabNavigationTest, DefaultInitializer) {
             SessionTypesTestHelper::GetReferrer(navigation).policy);
   EXPECT_EQ(GURL(), navigation.virtual_url());
   EXPECT_TRUE(navigation.title().empty());
+  EXPECT_TRUE(navigation.search_terms().empty());
   EXPECT_TRUE(navigation.content_state().empty());
   EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
             SessionTypesTestHelper::GetTransitionType(navigation));
@@ -118,6 +122,7 @@ TEST(TabNavigationTest, FromNavigationEntry) {
             SessionTypesTestHelper::GetReferrer(navigation).policy);
   EXPECT_EQ(kVirtualURL, navigation.virtual_url());
   EXPECT_EQ(kTitle, navigation.title());
+  EXPECT_EQ(kSearchTerms, navigation.search_terms());
   EXPECT_EQ(kContentState, navigation.content_state());
   EXPECT_EQ(kTransitionType,
             SessionTypesTestHelper::GetTransitionType(navigation));
@@ -147,6 +152,7 @@ TEST(TabNavigationTest, FromSyncData) {
             SessionTypesTestHelper::GetReferrer(navigation).policy);
   EXPECT_EQ(kVirtualURL, navigation.virtual_url());
   EXPECT_EQ(kTitle, navigation.title());
+  EXPECT_EQ(kSearchTerms, navigation.search_terms());
   EXPECT_EQ(kContentState, navigation.content_state());
   EXPECT_EQ(kTransitionType,
             SessionTypesTestHelper::GetTransitionType(navigation));
@@ -180,6 +186,7 @@ TEST(TabNavigationTest, Pickle) {
             SessionTypesTestHelper::GetReferrer(new_navigation).policy);
   EXPECT_EQ(kVirtualURL, new_navigation.virtual_url());
   EXPECT_EQ(kTitle, new_navigation.title());
+  EXPECT_EQ(kSearchTerms, new_navigation.search_terms());
   EXPECT_TRUE(new_navigation.content_state().empty());
   EXPECT_EQ(kTransitionType,
             SessionTypesTestHelper::GetTransitionType(new_navigation));
@@ -211,6 +218,7 @@ TEST(TabNavigationTest, ToNavigationEntry) {
   EXPECT_EQ(kReferrer.policy, new_navigation_entry->GetReferrer().policy);
   EXPECT_EQ(kVirtualURL, new_navigation_entry->GetVirtualURL());
   EXPECT_EQ(kTitle, new_navigation_entry->GetTitle());
+  EXPECT_EQ(kSearchTerms, new_navigation_entry->GetSearchTerms());
   EXPECT_EQ(kContentState, new_navigation_entry->GetContentState());
   EXPECT_EQ(kPageID, new_navigation_entry->GetPageID());
   EXPECT_EQ(content::PAGE_TRANSITION_RELOAD,
@@ -295,6 +303,7 @@ TEST(SessionTab, FromSyncData) {
     navigation->set_virtual_url("http://foo/" + base::IntToString(i));
     navigation->set_referrer("referrer");
     navigation->set_title("title");
+    navigation->set_search_terms("my search terms");
     navigation->set_page_transition(sync_pb::SyncEnums_PageTransition_TYPED);
   }
 
@@ -325,6 +334,8 @@ TEST(SessionTab, FromSyncData) {
     EXPECT_EQ(GURL("referrer"),
               SessionTypesTestHelper::GetReferrer(tab.navigations[i]).url);
     EXPECT_EQ(string16(ASCIIToUTF16("title")), tab.navigations[i].title());
+    EXPECT_EQ(string16(ASCIIToUTF16("my search terms")),
+              tab.navigations[i].search_terms());
     EXPECT_EQ(content::PAGE_TRANSITION_TYPED,
               SessionTypesTestHelper::GetTransitionType(tab.navigations[i]));
     EXPECT_EQ(GURL("http://foo/" + base::IntToString(i)),
@@ -363,6 +374,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());