Modify TemplateURLRef to remove unknown URL parameters, but only when it represents a prepopulate...

chrome/browser/search_engines/template_url_unittest.cc

 // Copyright (c) 2011 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 "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_terms_data.h"
@@ skipping 133 matching lines @@
   TemplateURLRef ref(
       "http://foo{searchTerms}x{inputEncoding?}y{outputEncoding?}a", 1, 2);
   ASSERT_TRUE(ref.IsValid());
   ASSERT_TRUE(ref.SupportsReplacement());
   GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   ASSERT_TRUE(result.is_valid());
   ASSERT_EQ("http://fooxxutf-8ya/", result.spec());
 }
 
+TEST_F(TemplateURLTest, SetPrepopulatedAndParse) {

[sky, 2011/06/28 21:02:26]

Add a description of what this is testing.

+  TemplateURL t_url;
+  t_url.SetURL("http://foo{fhqwhgads}", 0, 0);
+  TemplateURLRef::Replacements replacements;
+  bool valid = false;
+
+  t_url.SetPrepopulateId(0);
+  EXPECT_EQ("http://foo{fhqwhgads}",
+            t_url.url()->ParseURL("http://foo{fhqwhgads}",
+            &replacements,
+            &valid));
+  EXPECT_TRUE(replacements.empty());
+  EXPECT_TRUE(valid);
+
+  t_url.SetPrepopulateId(123);
+  EXPECT_EQ("http://foo",
+            t_url.url()->ParseURL("http://foo{fhqwhgads}",
+            &replacements,
+            &valid));
+  EXPECT_TRUE(replacements.empty());
+  EXPECT_TRUE(valid);
+}
+
 TEST_F(TemplateURLTest, InputEncodingBeforeSearchTerm) {
   TemplateURL t_url;
   TemplateURLRef ref(
       "http://foox{inputEncoding?}a{searchTerms}y{outputEncoding?}b", 1, 2);
   ASSERT_TRUE(ref.IsValid());
   ASSERT_TRUE(ref.SupportsReplacement());
   GURL result = GURL(ref.ReplaceSearchTerms(t_url, ASCIIToUTF16("X"),
       TemplateURLRef::NO_SUGGESTIONS_AVAILABLE, string16()));
   ASSERT_TRUE(result.is_valid());
   ASSERT_EQ("http://fooxutf-8axyb/", result.spec());
@@ skipping 315 matching lines @@
   TemplateURLRef url_ref(parsed_url, 0, 0);
   TemplateURLRef::Replacements replacements;
   EXPECT_TRUE(url_ref.ParseParameter(0, 12, &parsed_url, &replacements));
   EXPECT_EQ(std::string(), parsed_url);
   ASSERT_EQ(1U, replacements.size());
   EXPECT_EQ(static_cast<size_t>(0), replacements[0].index);
   EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
 }
 
 TEST_F(TemplateURLTest, ParseParameterUnknown) {
-  std::string parsed_url("{}");
+  std::string parsed_url("{fhqwhgads}");
   TemplateURLRef url_ref(parsed_url, 0, 0);
   TemplateURLRef::Replacements replacements;
-  EXPECT_FALSE(url_ref.ParseParameter(0, 1, &parsed_url, &replacements));
-  EXPECT_EQ("{}", parsed_url);
+
+  // By default, TemplateURLRef should not consider itself prepopulated.
+  // Therefore we should not replace the unknown parameter.
+  EXPECT_FALSE(url_ref.ParseParameter(0, 10, &parsed_url, &replacements));
+  EXPECT_EQ("{fhqwhgads}", parsed_url);
+  EXPECT_TRUE(replacements.empty());
+
+  // If the TemplateURLRef is prepopulated, we should remove unknown parameters.
+  parsed_url = "{fhqwhgads}";
+  url_ref.set_prepopulated(true);
+  EXPECT_FALSE(url_ref.ParseParameter(0, 10, &parsed_url, &replacements));
+  EXPECT_EQ("", parsed_url);
   EXPECT_TRUE(replacements.empty());
 }
 
 TEST_F(TemplateURLTest, ParseURLEmpty) {
   TemplateURLRef url_ref("", 0, 0);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ(std::string(), url_ref.ParseURL("", &replacements, &valid));
   EXPECT_TRUE(replacements.empty());
   EXPECT_TRUE(valid);
@@ skipping 32 matching lines @@
 TEST_F(TemplateURLTest, ParseURLNestedParameter) {
   TemplateURLRef url_ref("{%s", 0, 0);
   TemplateURLRef::Replacements replacements;
   bool valid = false;
   EXPECT_EQ("{", url_ref.ParseURL("{{searchTerms}", &replacements, &valid));
   ASSERT_EQ(1U, replacements.size());
   EXPECT_EQ(static_cast<size_t>(1), replacements[0].index);
   EXPECT_EQ(TemplateURLRef::SEARCH_TERMS, replacements[0].type);
   EXPECT_TRUE(valid);
 }