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

components/search_engines/template_url_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/metrics/proto/omnibox_event.pb.h"
@@ skipping 1489 matching lines @@
   TemplateURLData data;
   search_terms_data_.set_google_base_url("http://bar/");
   data.SetURL("http://bar/_/contextualsearch?"
               "{google:contextualSearchVersion}"
               "{google:contextualSearchContextData}");
 
   TemplateURL url(data);
   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_);
   EXPECT_EQ("http://bar/_/contextualsearch?"
                 "ctxs=1&"
                 "ctxs_start=6&"
                 "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) {
   ASSERT_EQ(ASCIIToUTF16("foo"),
             TemplateURL::GenerateKeyword(GURL("http://foo")));
   // www. should be stripped.
   ASSERT_EQ(ASCIIToUTF16("foo"),
             TemplateURL::GenerateKeyword(GURL("http://www.foo")));
   // Make sure we don't get a trailing '/'.
   ASSERT_EQ(ASCIIToUTF16("blah"),
@@ skipping 39 matching lines @@
   EXPECT_EQ("http://bar/search?q=foo&pfq=full%20query%20text&qha=2338&xssi=t",
             result);
 
   TemplateURL url2(data);
   search_terms_args.prefetch_query.clear();
   search_terms_args.prefetch_query_type.clear();
   result =
       url2.url_ref().ReplaceSearchTerms(search_terms_args, search_terms_data_);
   EXPECT_EQ("http://bar/search?q=foo&xssi=t", result);
 }