Update the contextual search API to include a parameter specifying whether the...

Update the contextual search API to include a parameter specifying whether the server shoudl return a resolved search term.

BUG=397734,397738

Review URL: https://codereview.chromium.org/424013002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@287681 0039d316-1c4b-4281-b951-d872f2087c98

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;
       }

components/search_engines/template_url.h

@@ -74,6 +74,7 @@ class TemplateURLRef {
 
     struct ContextualSearchParams {
       ContextualSearchParams();
+      // TODO(jeremycho): Delete constructor once Clank no longer depends on it.
       ContextualSearchParams(const int version,
                              const size_t start,
                              const size_t end,
@@ -81,6 +82,14 @@ class TemplateURLRef {
                              const std::string& content,
                              const std::string& base_page_url,
                              const std::string& encoding);
+      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);
       ~ContextualSearchParams();
 
       // The version of contextual search.
@@ -103,6 +112,11 @@ class TemplateURLRef {
 
       // The encoding of content.
       std::string encoding;
+
+      // If true, the server will generate a search term based on the user
+      // selection and context.  Otherwise the user selection will be used as-is
+      // as the search term.
+      bool resolve;
     };
 
     // The search terms (query).

components/search_engines/template_url_unittest.cc

@@ -1507,11 +1507,11 @@ TEST_F(TemplateURLTest, ContextualSearchParameters) {
   TemplateURLRef::SearchTermsArgs search_terms_args(ASCIIToUTF16("foo"));
   std::string result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                                         search_terms_data_);
-  EXPECT_EQ("http://bar/_/contextualsearch?", result);
+  EXPECT_EQ("http://bar/_/contextualsearch?ctxsl_resolve=1", result);
 
   TemplateURLRef::SearchTermsArgs::ContextualSearchParams params(
       1, 6, 11, "allen", "woody+allen+movies", "www.wikipedia.org",
-      "utf-8");
+      "utf-8", true);
   search_terms_args.contextual_search_params = params;
   result = url.url_ref().ReplaceSearchTerms(search_terms_args,
                                             search_terms_data_);
@@ -1521,8 +1521,10 @@ TEST_F(TemplateURLTest, ContextualSearchParameters) {
                 "ctxs_end=11&"
                 "q=allen&"
                 "ctxs_content=woody+allen+movies&"
-                "ctxs_url=www.wikipedia.org&"
-            "ctxs_encoding=utf-8&", result);
+                "ctxsl_url=www.wikipedia.org&"
+                "ctxs_encoding=utf-8&"
+                "ctxsl_resolve=1",
+            result);
 }
 
 TEST_F(TemplateURLTest, GenerateKeyword) {