[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 42 matching lines @@
   }
 
   {
     string16 title;
     if (!iterator->ReadString16(&title))
       return false;
     entry->SetTitle(title);
   }
 
   {
+    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;
     entry->SetContentState(content_state);
   }
 
   {
     bool has_post_data;
     if (!iterator->ReadBool(&has_post_data))
       return false;
@@ skipping 27 matching lines @@
       return false;
     entry->SetTimestamp(base::Time::FromInternalValue(timestamp));
   }
 
   return true;
 }
 
 }  // namespace internal
 
 }  // namespace android_webview