[Search] Store and recall search terms using NavigationEntry to improve search term extraction

content/browser/web_contents/navigation_entry_impl.h

Index: content/browser/web_contents/navigation_entry_impl.h
diff --git a/content/browser/web_contents/navigation_entry_impl.h b/content/browser/web_contents/navigation_entry_impl.h
index c65bdb32b75a9d9dea2f212e344bb4000ae06810..7695ffa55b51ba7cdf011ee79ae8b3014f34976a 100644
--- a/content/browser/web_contents/navigation_entry_impl.h
+++ b/content/browser/web_contents/navigation_entry_impl.h
@@ -7,6 +7,7 @@
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "base/values.h"

[sreeram, 2013/01/30 21:41:39]

Remove this? (it appears to be unused)

[Mathieu, 2013/01/30 21:55:12]

Done.

 #include "content/browser/site_instance_impl.h"
 #include "content/public/browser/favicon_status.h"
 #include "content/public/browser/global_request_id.h"
@@ -75,6 +76,10 @@ class CONTENT_EXPORT NavigationEntryImpl
   virtual bool GetCanLoadLocalResources() const OVERRIDE;
   virtual void SetFrameToNavigate(const std::string& frame_name) OVERRIDE;
   virtual const std::string& GetFrameToNavigate() const OVERRIDE;
+  virtual void SetExtraData(const std::string& key,
+                            const string16& data) OVERRIDE;
+  virtual const bool GetExtraData(const std::string& key,
+                                  string16* out_value) const OVERRIDE;

[sreeram, 2013/01/30 21:41:39]

virtual bool GetExtraData(const std::string& key, string16* data) const
OVERRIDE;

[Mathieu, 2013/01/30 21:55:12]

Done. Renamed throughout.

 
   void set_unique_id(int unique_id) {
     unique_id_ = unique_id;
@@ -265,6 +270,10 @@ class CONTENT_EXPORT NavigationEntryImpl
   // persisted, because it is currently only used in tests.
   std::string frame_to_navigate_;
 
+  // Used to store extra data to support browser features.
+  typedef std::map<std::string, string16> ExtraDataMap;

[sreeram, 2013/01/30 21:41:39]

This typedef seems unnecessary, given that it's only used in one place.

[Mathieu, 2013/01/30 21:55:12]

Done.

+  ExtraDataMap extra_data_;
+
   // Copy and assignment is explicitly allowed for this class.
 };