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

components/search_engines/template_url.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 "components/search_engines/template_url.h"
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 186 matching lines @@
     ContextualSearchParams()
     : version(-1),
       start(base::string16::npos),
       end(base::string16::npos),
       resolve(true) {
 }
 
 TemplateURLRef::SearchTermsArgs::ContextualSearchParams::
     ContextualSearchParams(
         const int version,
-        const size_t start,
-        const size_t end,
-        const std::string& selection,

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

Jeremy for logging please include the selection too and use it in the q= cgi
arg.

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

Done.

-        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),
+      start(base::string16::npos),
+      end(base::string16::npos),
       base_page_url(base_page_url),
-      encoding(encoding),
-      resolve(true) {
+      resolve(resolve) {
 }
 
 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,
@@ skipping 1238 matching lines @@
       // patterns. This means that given patterns
       //    [ "http://foo/#q={searchTerms}", "http://foo/?q={searchTerms}" ],
       // calling ExtractSearchTermsFromURL() on "http://foo/?q=bar#q=' would
       // return false. This is important for at least Google, where such URLs
       // are invalid.
       return !search_terms->empty();
     }
   }
   return false;
 }