Add ContextualSearchParams constructor to be called when content is passed via HTTP header and not …

components/search_engines/template_url.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 #define COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_
 
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 56 matching lines @@
 
   // This struct encapsulates arguments passed to
   // TemplateURLRef::ReplaceSearchTerms methods.  By default, only search_terms
   // is required and is passed in the constructor.
   struct SearchTermsArgs {
     explicit SearchTermsArgs(const base::string16& search_terms);
     ~SearchTermsArgs();
 
     struct ContextualSearchParams {
       ContextualSearchParams();
+      // TODO(jeremycho): Remove base_page_url parameter once it is logged from
+      // the HTTP header.
+      ContextualSearchParams(const int version,

[donnd, 2014/09/16 21:23:18]

I would add comments detailing what the difference between these two
constructors is.  Otherwise readers may just assume that one is a simplified
version of the other rather than having quite strict requirements.

[jeremycho, 2014/09/16 21:26:53]

Done.

+                             const std::string& base_page_url,
+                             const bool resolve);
       // TODO(jeremycho): Delete constructor once Clank no longer depends on it.
       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);
-      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.
       int version;
 
@@ skipping 620 matching lines @@
   TemplateURLRef new_tab_url_ref_;
   TemplateURLRef contextual_search_url_ref_;
   scoped_ptr<AssociatedExtensionInfo> extension_info_;
 
   // TODO(sky): Add date last parsed OSD file.
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURL);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_TEMPLATE_URL_H_