[Search] No longer reverting omnibox text on instant search

android_webview/native/state_serializer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/native/state_serializer.h"
 
 #include <string>
 
 #include "base/memory/scoped_vector.h"
 #include "base/pickle.h"
@@ skipping 128 matching lines @@
 
   const content::Referrer& referrer = entry.GetReferrer();
   if (!pickle->WriteString(referrer.url.spec()))
     return false;
   if (!pickle->WriteInt(static_cast<int>(referrer.policy)))
     return false;
 
   if (!pickle->WriteString16(entry.GetTitle()))
     return false;
 
+  if (!pickle->WriteString16(entry.GetSearchTerms()))
+    return false;
+
   if (!pickle->WriteString(entry.GetContentState()))
     return false;
 
   if (!pickle->WriteBool(static_cast<int>(entry.GetHasPostData())))
     return false;
 
   if (!pickle->WriteString(entry.GetOriginalRequestURL().spec()))
     return false;
 
   if (!pickle->WriteString(entry.GetBaseURLForDataURL().spec()))
@@ skipping 83 matching lines @@
     entry->SetIsOverridingUserAgent(is_overriding_user_agent);
   }
 
   {
     int64 timestamp;
     if (!iterator->ReadInt64(&timestamp))
       return false;
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
+  {
+    string16 search_terms;
+    if (!iterator->ReadString16(&search_terms)) {
+      search_terms = string16();
+  }
+
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview