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

chrome/browser/search_engines/template_url.cc

Index: chrome/browser/search_engines/template_url.cc
===================================================================
--- chrome/browser/search_engines/template_url.cc	(revision 90805)
+++ chrome/browser/search_engines/template_url.cc	(working copy)
@@ -85,7 +85,8 @@
       page_offset_(page_offset),
       parsed_(false),
       valid_(false),
-      supports_replacements_(false) {
+      supports_replacements_(false),
+      prepopulated_(false) {
 }
 
 void TemplateURLRef::Set(const std::string& url,
@@ -150,8 +151,11 @@
   } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
     replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
   } else {
-    // It can be some garbage but can also be a javascript block. Put it back.
-    url->insert(start, full_parameter);
+    // If it's a prepopulated URL, we know that it's safe to remove unknown
+    // parameters. Otherwise it could be some garbage but can also be a
+    // javascript block. Put it back.
+    if (!prepopulated_)
+      url->insert(start, full_parameter);
     return false;
   }
   return true;
@@ -685,6 +689,14 @@
   return GURL();
 }
 
+void TemplateURL::SetPrepopulateId(int id) {
+  prepopulate_id_ = id;
+  if (id > 0)

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

Convert these to SetTemplateURLRefsPrepopulate(id > 0);

+    SetTemplateURLRefsPrepopulated(true);
+  else
+    SetTemplateURLRefsPrepopulated(false);
+}
+
 void TemplateURL::InvalidateCachedValues() const {
   url_.InvalidateCachedValues();
   suggestions_url_.InvalidateCachedValues();
@@ -694,6 +706,12 @@
   }
 }
 
+void TemplateURL::SetTemplateURLRefsPrepopulated(bool prepopulated) {
+  suggestions_url_.set_prepopulated(prepopulated);
+  url_.set_prepopulated(prepopulated);
+  instant_url_.set_prepopulated(prepopulated);
+}
+
 std::string TemplateURL::GetExtensionId() const {
   DCHECK(IsExtensionKeyword());
   return GURL(url_.url()).host();