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

content/browser/web_contents/navigation_entry_impl_unittest.cc

Index: content/browser/web_contents/navigation_entry_impl_unittest.cc
diff --git a/content/browser/web_contents/navigation_entry_impl_unittest.cc b/content/browser/web_contents/navigation_entry_impl_unittest.cc
index 0e8fa33f6cbcb6e7ab0aca93b88ffbd21c9ad68e..7970a82d295ec9e6b8190f0dd43f67d2507bc9ce 100644
--- a/content/browser/web_contents/navigation_entry_impl_unittest.cc
+++ b/content/browser/web_contents/navigation_entry_impl_unittest.cc
@@ -217,4 +217,16 @@ TEST_F(NavigationEntryTest, NavigationEntryTimestamps) {
   EXPECT_EQ(now, entry1_->GetTimestamp());
 }
 
+// Test extra data stored in the navigation entry.
+TEST_F(NavigationEntryTest, NavigationEntryExtraData) {
+  string16 test_data = ASCIIToUTF16("my search terms");
+  string16 output;
+  entry1_->SetExtraData("search_terms", test_data);
+
+  EXPECT_FALSE(entry1_->GetExtraData("non_existent_key", &output));
+  EXPECT_EQ(output, ASCIIToUTF16(""));
+  EXPECT_TRUE(entry1_->GetExtraData("search_terms", &output));
+  EXPECT_EQ(output, test_data);

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

Swap the EXPECT_EQ arguments (here and on line 227). The convention is
EXPECT_EQ(expected, actual).

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

Done. Sorry I missed this.

+}
+
 }  // namespace content