[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..111ca71e573fabb97d854d95ef09431324a2db2e 100644
--- a/android_webview/native/state_serializer.cc
+++ b/android_webview/native/state_serializer.cc
@@ -164,6 +164,9 @@ bool WriteNavigationEntryToPickle(const content::NavigationEntry& entry,
   if (!pickle->WriteInt64(entry.GetTimestamp().ToInternalValue()))
     return false;
 
+  if (!pickle->WriteString16(entry.GetSearchTerms()))
+    return false;

[joth, 2012/12/13 02:11:48]

fwiw the java-side of the webview API has no way to read/write search terms, so
there's not much point us persisting these. (AIUI the content/ layer would never
spontaneously push values into this field? It's purely up to the embedder to
populate this field, and android_webview/ never would).

but equally, doesn't hurt to have this here.

[boliu, 2012/12/13 02:26:46]

Right, agree with joth here that android webview won't be using this field, so
there is no point in persisting it. Also save/restore is probably a hot path for
android, but not that a single empty string will make a difference.

+
   // Please update AW_STATE_VERSION if serialization format is changed.

[joth, 2012/12/13 02:11:48]

guess you didn't see this comment? Maybe put some bold flashing ascii art on it?

 
   return true;
@@ -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();

[joth, 2012/12/13 02:11:48]

this doesn't make sense? you're modifying a local, but it never makes it into
entry->SetSearchTerms(search_terms). the tests should catch this.

Following pattern above, it should be return false if the read failed.

+  }
+
   return true;
 }