Cleanup thumbnail database part #2

chrome/browser/history/history_backend_unittest.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 <set>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 190 matching lines @@
     URLID id = backend_->db()->GetRowForURL(url, &row);
     VisitVector visits;
     EXPECT_TRUE(backend_->db()->GetVisitsForURL(id, &visits));
     return visits[0].transition;
   }
 
   FilePath getTestDir() {
     return test_dir_;
   }
 
+  // Returns a gfx::Size vector with small and large sizes.
+  const std::vector<gfx::Size>& GetSizesSmallAndLarge() {
+    CR_DEFINE_STATIC_LOCAL(std::vector<gfx::Size>, kSizesSmallAndLarge, ());

[sky, 2012/09/07 18:16:47]

This is a test, there's no point in forcing a static here. Return a new vector
each time.

+    if (kSizesSmallAndLarge.empty()) {
+      kSizesSmallAndLarge.push_back(kSmallSize);
+      kSizesSmallAndLarge.push_back(kLargeSize);
+    }
+    return kSizesSmallAndLarge;
+  }
+
   FaviconID GetFavicon(const GURL& url, IconType icon_type) {
     std::vector<IconMapping> icon_mappings;
     if (backend_->thumbnail_db_->GetIconMappingsForPageURL(url, icon_type,
                                                            &icon_mappings))
       return icon_mappings[0].icon_id;
     else
       return 0;
   }
 
   BookmarkModel bookmark_model_;
 
  protected:
   bool loaded_;
 
  private:
   friend class HistoryBackendTestDelegate;
 
   // testing::Test
   virtual void SetUp() {
     if (!file_util::CreateNewTempDirectory(FILE_PATH_LITERAL("BackendTest"),
                                            &test_dir_))
       return;
     backend_ = new HistoryBackend(test_dir_,
                                   0,
                                   new HistoryBackendTestDelegate(this),
                                   &bookmark_model_);
     backend_->Init(std::string(), false);
   }
+
   virtual void TearDown() {
     if (backend_.get())
       backend_->Closing();
     backend_ = NULL;
     mem_backend_.reset();
     file_util::Delete(test_dir_, true);
   }
 
   void SetInMemoryBackend(int backend_id, InMemoryHistoryBackend* backend) {
     mem_backend_.reset(backend);
   }
 
   void BroadcastNotifications(int type,
-                                      HistoryDetails* details) {
+                              HistoryDetails* details) {
     // Send the notifications directly to the in-memory database.
     content::Details<HistoryDetails> det(details);
     mem_backend_->Observe(type, content::Source<HistoryBackendTest>(NULL), det);
 
     // The backend passes ownership of the details pointer to us.
     delete details;
   }
 
   MessageLoop message_loop_;
   FilePath test_dir_;
@@ skipping 34 matching lines @@
 TEST_F(HistoryBackendTest, DeleteAll) {
   ASSERT_TRUE(backend_.get());
 
   // Add two favicons, each with two bitmaps. Note that we add favicon2 before
   // adding favicon1. This is so that favicon1 one gets ID 2 autoassigned to
   // the database, which will change when the other one is deleted. This way
   // we can test that updating works properly.
   GURL favicon_url1("http://www.google.com/favicon.ico");
   GURL favicon_url2("http://news.google.com/favicon.ico");
   FaviconID favicon2 = backend_->thumbnail_db_->AddFavicon(favicon_url2,
-                                                           FAVICON);
+      FAVICON, GetSizesSmallAndLarge());
   FaviconID favicon1 = backend_->thumbnail_db_->AddFavicon(favicon_url1,
-                                                           FAVICON);
+      FAVICON, GetSizesSmallAndLarge());
 
   std::vector<unsigned char> data;
   data.push_back('a');
   EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,
       new base::RefCountedBytes(data), Time::Now(), kSmallSize));
   data[0] = 'b';
   EXPECT_TRUE(backend_->thumbnail_db_->AddFaviconBitmap(favicon1,
      new base::RefCountedBytes(data), Time::Now(), kLargeSize));
 
   data[0] = 'c';
@@ skipping 1359 matching lines @@
 
     backend_->DeleteURL(url);
     backend_->AddPageNoVisitForBookmark(url, string16());
     backend_->GetURL(url, &row);
     EXPECT_EQ(url, row.url());
     EXPECT_EQ(UTF8ToUTF16(url.spec()), row.title());
     EXPECT_EQ(0, row.visit_count());
 }
 
 }  // namespace history