Fix first run search engine dialog images.

chrome/browser/webdata/web_database_unittest.cc

 // Copyright (c) 2010 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 <list>
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 #include <vector>
@@ skipping 137 matching lines @@
   }
 
   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);
   }
 
+  static void set_logo_id(TemplateURL* url, int id) {
+    url->set_logo_id(id);
+  }
+
   static AutofillEntry MakeAutofillEntry(const char* name,
                                          const char* value,
                                          time_t timestamp0,
                                          time_t timestamp1) {
     std::vector<base::Time> timestamps;
     if (timestamp0 >= 0)
       timestamps.push_back(Time::FromTimeT(timestamp0));
     if (timestamp1 >= 0)
       timestamps.push_back(Time::FromTimeT(timestamp1));
     return AutofillEntry(
@@ skipping 14 matching lines @@
   GURL favicon_url("http://favicon.url/");
   GURL originating_url("http://google.com/");
   template_url.SetFavIconURL(favicon_url);
   template_url.SetURL("http://url/", 0, 0);
   template_url.set_safe_for_autoreplace(true);
   template_url.set_show_in_default_list(true);
   template_url.set_originating_url(originating_url);
   template_url.set_usage_count(32);
   template_url.add_input_encoding("UTF-8");
   set_prepopulate_id(&template_url, 10);
+  set_logo_id(&template_url, 1000);
   SetID(1, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
 
   std::vector<TemplateURL*> template_urls;
   EXPECT_TRUE(db.GetKeywords(&template_urls));
 
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
 
@@ skipping 13 matching lines @@
 
   EXPECT_TRUE(originating_url == restored_url->originating_url());
 
   EXPECT_EQ(32, restored_url->usage_count());
 
   ASSERT_EQ(1U, restored_url->input_encodings().size());
   EXPECT_EQ("UTF-8", restored_url->input_encodings()[0]);
 
   EXPECT_EQ(10, restored_url->prepopulate_id());
 
+  EXPECT_EQ(1000, restored_url->logo_id());
+
   EXPECT_TRUE(db.RemoveKeyword(restored_url->id()));
 
   template_urls.clear();
   EXPECT_TRUE(db.GetKeywords(&template_urls));
 
   EXPECT_EQ(0U, template_urls.size());
 
   delete restored_url;
 }
 
@@ skipping 30 matching lines @@
   SetID(1, &template_url);
 
   EXPECT_TRUE(db.AddKeyword(template_url));
 
   GURL originating_url2("http://originating.url/");
   template_url.set_originating_url(originating_url2);
   template_url.set_autogenerate_keyword(true);
   EXPECT_EQ(L"url", template_url.keyword());
   template_url.add_input_encoding("Shift_JIS");
   set_prepopulate_id(&template_url, 5);
+  set_logo_id(&template_url, 2000);
   EXPECT_TRUE(db.UpdateKeyword(template_url));
 
   std::vector<TemplateURL*> template_urls;
   EXPECT_TRUE(db.GetKeywords(&template_urls));
 
   EXPECT_EQ(1U, template_urls.size());
   const TemplateURL* restored_url = template_urls.front();
 
   EXPECT_EQ(template_url.short_name(), restored_url->short_name());
 
@@ skipping 14 matching lines @@
   ASSERT_EQ(1U, restored_url->input_encodings().size());
   ASSERT_EQ("Shift_JIS", restored_url->input_encodings()[0]);
 
   EXPECT_EQ(template_url.suggestions_url()->url(),
             restored_url->suggestions_url()->url());
 
   EXPECT_EQ(template_url.id(), restored_url->id());
 
   EXPECT_EQ(template_url.prepopulate_id(), restored_url->prepopulate_id());
 
+  EXPECT_EQ(template_url.logo_id(), restored_url->logo_id());
+
   delete restored_url;
 }
 
 TEST_F(WebDatabaseTest, KeywordWithNoFavicon) {
   WebDatabase db;
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_));
 
   TemplateURL template_url;
   template_url.set_short_name(L"short_name");
@@ skipping 1171 matching lines @@
 
   // make sure the lists of entries match
   ASSERT_EQ(expected_entries.size(), entry_set.size());
   AutofillEntrySetIterator it;
   for (it = entry_set.begin(); it != entry_set.end(); it++) {
     expected_entries.erase(*it);
   }
 
   EXPECT_EQ(0U, expected_entries.size());
 }