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

chrome/browser/search_engines/template_url_unittest.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 "base/base_paths.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 126 matching lines @@
   } to_wide_cases[] = {
     {"hello+world", L"hello world"},
     // Test some big-5 input.
     {"%a7A%A6%6e+to+you", L"\x4f60\x597d to you"},
     // Test some UTF-8 input. We should fall back to this when the encoding
     // doesn't look like big-5. We have a '5' in the middle, which is an invalid
     // Big-5 trailing byte.
     {"%e4%bd%a05%e5%a5%bd+to+you", L"\x4f60\x35\x597d to you"},
     // Undecodable input should stay escaped.
     {"%91%01+abcd", L"%91%01 abcd"},
+    // Make sure we convert %2B to +.
+    {"C%2B%2B", L"C++"},
+    // C%2B is escaped as C%252B, make sure we unescape it properly.
+    {"C%252B", L"C%2B"},
   };
 
   TemplateURL t_url;
 
   // Set one input encoding: big-5. This is so we can test fallback to UTF-8.
   std::vector<std::string> encodings;
   encodings.push_back("big-5");
   t_url.set_input_encodings(encodings);
 
   TemplateURLRef ref(L"http://foo?q={searchTerms}", 1, 2);
@@ skipping 229 matching lines @@
   EXPECT_FALSE(t_url.autogenerate_keyword());
   t_url.set_keyword(L"foo");
   EXPECT_EQ(L"foo", t_url.keyword());
   t_url.set_autogenerate_keyword(true);
   EXPECT_TRUE(t_url.autogenerate_keyword());
   EXPECT_EQ(L"google.com", t_url.keyword());
   t_url.set_keyword(L"foo");
   EXPECT_FALSE(t_url.autogenerate_keyword());
   EXPECT_EQ(L"foo", t_url.keyword());
 }