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

chrome/browser/webdata/keyword_table.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/webdata/keyword_table.h"
 
 #include "app/sql/statement.h"
 #include "base/logging.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
@@ skipping 157 matching lines @@
     template_url->set_usage_count(s.ColumnInt(8));
 
     std::vector<std::string> encodings;
     base::SplitString(s.ColumnString(9), ';', &encodings);
     template_url->set_input_encodings(encodings);
 
     template_url->set_show_in_default_list(s.ColumnInt(10) == 1);
 
     template_url->SetSuggestionsURL(s.ColumnString(11), 0, 0);
 
-    template_url->set_prepopulate_id(s.ColumnInt(12));
+    template_url->SetPrepopulateId(s.ColumnInt(12));
 
     template_url->set_autogenerate_keyword(s.ColumnInt(13) == 1);
 
     template_url->set_logo_id(s.ColumnInt(14));
 
     template_url->set_created_by_policy(s.ColumnBool(15));
 
     template_url->SetInstantURL(s.ColumnString(16), 0, 0);
 
     template_url->set_last_modified(Time::FromTimeT(s.ColumnInt64(17)));
@@ skipping 105 matching lines @@
   if (!db_->Execute("ALTER TABLE keywords_temp RENAME TO keywords"))
     return false;
 
   return true;
 }
 
 bool KeywordTable::MigrateToVersion38AddLastModifiedColumn() {
   return db_->Execute(
       "ALTER TABLE keywords ADD COLUMN last_modified INTEGER DEFAULT 0");
 }