Merge 22167 - Fixes bug in creating search terms where we weren't unescaping...

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2006-2008 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 "chrome/browser/search_engines/template_url.h"
 
 #include "app/gfx/favicon_size.h"
 #include "app/l10n_util.h"
 #include "base/logging.h"
 #include "base/string_util.h"
@@ skipping 381 matching lines @@
   ParseIfNecessary();
   return search_term_key_;
 }
 
 std::wstring TemplateURLRef::SearchTermToWide(const TemplateURL& host,
                                               const std::string& term) const {
   const std::vector<std::string>& encodings = host.input_encodings();
   std::wstring result;
 
   std::string unescaped =
-      UnescapeURLComponent(term, UnescapeRule::REPLACE_PLUS_WITH_SPACE);
+      UnescapeURLComponent(term, UnescapeRule::REPLACE_PLUS_WITH_SPACE |
+                                 UnescapeRule::URL_SPECIAL_CHARS);
   for (size_t i = 0; i < encodings.size(); ++i) {
     if (CodepageToWide(unescaped, encodings[i].c_str(),
                        OnStringUtilConversionError::FAIL, &result))
       return result;
   }
 
   // Always fall back on UTF-8 if it works.
   if (CodepageToWide(unescaped, "UTF-8",
                      OnStringUtilConversionError::FAIL, &result))
     return result;
@@ skipping 154 matching lines @@
   }
   return GURL();
 }
 
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
   if (autogenerate_keyword_)
     keyword_.clear();
 }