Update the contextual search API to include a parameter specifying whether the server shoudl return…

components/search_engines/template_url.h

Index: components/search_engines/template_url.h
diff --git a/components/search_engines/template_url.h b/components/search_engines/template_url.h
index e427b8cd02417469a6a52707c2dce5b51631686f..9594825df26c395ef0c21329e1d91296bdbdfd78 100644
--- a/components/search_engines/template_url.h
+++ b/components/search_engines/template_url.h
@@ -81,6 +81,14 @@ class TemplateURLRef {
                              const std::string& content,
                              const std::string& base_page_url,
                              const std::string& encoding);
+      ContextualSearchParams(const int version,

[Peter Kasting, 2014/07/31 05:14:03]

Don't add this in addition to the other constructor.  Replace the other
constructor with this version and update all callsites.

[jeremycho, 2014/07/31 20:29:08]

The existing constructor gets called by Clank so it can't be replaced in this
commit.  Once this commit is propagated and the Clank code is updated, I'll
delete it.

[Peter Kasting, 2014/07/31 20:33:49]

OK.  Consider a TODO about that if it will take more than a day or two.

[jeremycho, 2014/07/31 21:08:39]

Done.

+                             const size_t start,
+                             const size_t end,
+                             const std::string& selection,
+                             const std::string& content,
+                             const std::string& base_page_url,
+                             const std::string& encoding,
+                             const bool resolve);
       ~ContextualSearchParams();
 
       // The version of contextual search.
@@ -103,6 +111,9 @@ class TemplateURLRef {
 
       // The encoding of content.
       std::string encoding;
+
+      // Whether to return a resolved search term.

[Peter Kasting, 2014/07/31 05:14:03]

What does "return a resolved search term" mean?  There's not enough context for
me to understand the phrase.

[jeremycho, 2014/07/31 20:29:08]

Clarified.

+      bool resolve;
     };
 
     // The search terms (query).