Correctly ignore unknown parameters in prepopulated URLs.

chrome/browser/search_engines/template_url.cc

 // Copyright (c) 2012 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 389 matching lines @@
     replacements->push_back(Replacement(GOOGLE_INSTANT_ENABLED, 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 == kGoogleSearchFieldtrialParameter) {
     replacements->push_back(Replacement(GOOGLE_SEARCH_FIELDTRIAL_GROUP, start));
   } else if (parameter == kGoogleUnescapedSearchTermsParameter) {
     replacements->push_back(Replacement(GOOGLE_UNESCAPED_SEARCH_TERMS, start));
-  } else {
+  } else if (!prepopulated_) {
     // 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);
+    // parameters, so just ignore this and return true below. Otherwise it could
+    // be some garbage but can also be a javascript block. Put it back.
+    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 236 matching lines @@
       data_.SetKeyword(TemplateURLService::GenerateKeyword(url));
   }
 }
 
 void TemplateURL::InvalidateCachedValues() {
   url_ref_.InvalidateCachedValues();
   suggestions_url_ref_.InvalidateCachedValues();
   instant_url_ref_.InvalidateCachedValues();
   ResetKeywordIfNecessary(false);
 }