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

chrome/browser/webdata/keyword_table_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/file_util.h"
 #include "base/path_service.h"
 #include "base/string_number_conversions.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_paths.h"
@@ skipping 25 matching lines @@
 
   static int64 GetID(const TemplateURL* url) {
     return url->id();
   }
 
   static void SetID(int64 new_id, TemplateURL* url) {
     url->set_id(new_id);
   }
 
   static void set_prepopulate_id(TemplateURL* url, int id) {
-    url->set_prepopulate_id(id);
+    url->SetPrepopulateId(id);
   }
 
   static void set_logo_id(TemplateURL* url, int id) {
     url->set_logo_id(id);
   }
 
   FilePath file_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(KeywordTableTest);
@@ skipping 187 matching lines @@
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
 
   EXPECT_EQ(template_url.short_name(), restored_url->short_name());
   EXPECT_EQ(template_url.keyword(), restored_url->keyword());
   EXPECT_TRUE(!restored_url->GetFaviconURL().is_valid());
   EXPECT_TRUE(restored_url->safe_for_autoreplace());
   EXPECT_EQ(GetID(&template_url), GetID(restored_url));
   delete restored_url;
 }