[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..bf0dbe167239e57af31f08c5bbab7dea3ed67f84 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;
 
@@ -208,6 +211,13 @@ bool RestoreNavigationEntryFromPickle(PickleIterator* iterator,
   }
 
   {
+    string16 search_terms;

[akalin, 2012/12/06 23:14:46]

will this ever try to load 'old' pickled entries?  If so, it probably should go
on the end

[Mathieu, 2012/12/11 00:30:17]

Done. I've put it at the end, but it won't fail if it's not present as it's a
new field (similar to comments I got in session_types.cc). Let me know if that
sounds reasonable to you, and how we can be sure this is the right way to do it.

+    if (!iterator->ReadString16(&search_terms))
+      return false;
+    entry->SetSearchTerms(search_terms);
+  }
+
+  {
     string content_state;
     if (!iterator->ReadString(&content_state))
       return false;