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

components/search_engines/template_url.cc

Index: components/search_engines/template_url.cc
diff --git a/components/search_engines/template_url.cc b/components/search_engines/template_url.cc
index 6d360924997a5eb8929de3ac92171b8d115f3911..a68994d0c6b11a7ec507251a29cc4c36521496be 100644
--- a/components/search_engines/template_url.cc
+++ b/components/search_engines/template_url.cc
@@ -197,7 +197,8 @@ TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
     ContextualSearchParams()
     : version(-1),
       start(base::string16::npos),
-      end(base::string16::npos) {
+      end(base::string16::npos),
+      resolve(true) {
 }
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
@@ -215,7 +216,28 @@ TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
       selection(selection),
       content(content),
       base_page_url(base_page_url),
-      encoding(encoding) {
+      encoding(encoding),
+      resolve(true) {
+}
+
+TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
+    ContextualSearchParams(
+        const int version,
+        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)
+    : version(version),
+      start(start),
+      end(end),
+      selection(selection),
+      content(content),
+      base_page_url(base_page_url),
+      encoding(encoding),
+      resolve(resolve) {
 }
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
@@ -964,12 +986,15 @@ std::string TemplateURLRef::HandleReplacements(
           context_data.append("ctxs_content=" + params.content + "&");
 
         if (!params.base_page_url.empty())
-          context_data.append("ctxs_url=" + params.base_page_url + "&");
+          context_data.append("ctxsl_url=" + params.base_page_url + "&");
 
         if (!params.encoding.empty()) {
           context_data.append("ctxs_encoding=" + params.encoding + "&");
         }
 
+        context_data.append(
+            params.resolve ? "ctxsl_resolve=1" : "ctxsl_resolve=0");
+
         HandleReplacement(std::string(), context_data, *i, &url);
         break;
       }