[Search] No longer reverting omnibox text on instant search

android_webview/native/state_serializer.cc

Index: android_webview/native/state_serializer.cc
diff --git a/android_webview/native/state_serializer.cc b/android_webview/native/state_serializer.cc
index 656b2d03dec29e1257ef0e50c24462d1a9888740..a2960127dac878c8492e5cc7330f660f06b713e2 100644
--- a/android_webview/native/state_serializer.cc
+++ b/android_webview/native/state_serializer.cc
@@ -146,6 +146,9 @@ bool WriteNavigationEntryToPickle(const content::NavigationEntry& entry,
   if (!pickle->WriteString16(entry.GetTitle()))
     return false;
 
+  if (!pickle->WriteString16(entry.GetSearchTerms()))
+    return false;
+
   if (!pickle->WriteString(entry.GetContentState()))
     return false;
 
@@ -249,6 +252,12 @@ bool RestoreNavigationEntryFromPickle(PickleIterator* iterator,
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
+  {
+    string16 search_terms;
+    if (!iterator->ReadString16(&search_terms)) {
+      search_terms = string16();
+  }
+
   return true;
 }