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

chrome/browser/search_engines/template_url.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 "chrome/browser/search_engines/template_url.h"
 
 #include "base/i18n/case_conversion.h"
 #include "base/i18n/icu_string_conversions.h"
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 67 matching lines @@
 }
 
 TemplateURLRef::TemplateURLRef(const std::string& url,
                                int index_offset,
                                int page_offset)
     : url_(url),
       index_offset_(index_offset),
       page_offset_(page_offset),
       parsed_(false),
       valid_(false),
-      supports_replacements_(false) {
+      supports_replacements_(false),
+      prepopulated_(false) {
 }
 
 void TemplateURLRef::Set(const std::string& url,
                          int index_offset,
                          int page_offset) {
   url_ = url;
   index_offset_ = index_offset;
   page_offset_ = page_offset;
   InvalidateCachedValues();
 }
@@ skipping 44 matching lines @@
   } else if (parameter == kGoogleBaseSuggestURLParameter) {
     replacements->push_back(Replacement(GOOGLE_BASE_SUGGEST_URL, start));
   } else if (parameter == kGoogleOriginalQueryForSuggestionParameter) {
     replacements->push_back(Replacement(GOOGLE_ORIGINAL_QUERY_FOR_SUGGESTION,
                                         start));
   } else if (parameter == kGoogleRLZParameter) {
     replacements->push_back(Replacement(GOOGLE_RLZ, start));
   } 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;
 }
 
 std::string TemplateURLRef::ParseURL(const std::string& url,
                                      Replacements* replacements,
                                      bool* valid) const {
   *valid = false;
   std::string parsed_url = url;
@@ skipping 513 matching lines @@
   for (std::vector<ImageRef>::const_iterator i = image_refs_.begin();
        i != image_refs_.end(); ++i) {
     if ((i->type == "image/x-icon" || i->type == "image/vnd.microsoft.icon")
         && i->width == kFaviconSize && i->height == kFaviconSize) {
       return i->url;
     }
   }
   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();
   if (autogenerate_keyword_) {
     keyword_.clear();
     keyword_generated_ = false;
   }
 }
 
+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();
 }
 
 bool TemplateURL::IsExtensionKeyword() const {
   return GURL(url_.url()).SchemeIs(chrome::kExtensionScheme);
 }