Fixed TemplateURL::ReplaceSearchTermsInURL for non-alphanumeric terms.

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 1412 matching lines @@
   if (search_term_component == url::Parsed::QUERY) {
     old_params = url.query();
   } else if (search_term_component == url::Parsed::REF) {
     old_params = url.ref();
   } else {
     DCHECK_EQ(search_term_component, url::Parsed::PATH);
     old_params = url.path();
   }
 
   std::string new_params(old_params, 0, search_terms_position.begin);
-  new_params += base::UTF16ToUTF8(search_terms_args.search_terms);
+  new_params += base::UTF16ToUTF8(encoded_terms);
   new_params += old_params.substr(search_terms_position.end());
   GURL::Replacements replacements;
 
   if (search_term_component == url::Parsed::QUERY) {
     replacements.SetQueryStr(new_params);
   } else if (search_term_component == url::Parsed::REF) {
     replacements.SetRefStr(new_params);
   } else {
     DCHECK_EQ(search_term_component, url::Parsed::PATH);
     replacements.SetPathStr(new_params);
@@ skipping 99 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;
 }