Fix ThumbnailDatabase::RetainDataForPageUrls() to drop unretained page mappings

chrome/browser/history/thumbnail_database_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 <algorithm>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/files/file_enumerator.h"
 #include "base/files/file_path.h"
@@ skipping 288 matching lines @@
   EXPECT_EQ(id2, icon_mappings[1].icon_id);
 }
 
 TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrls) {
   ThumbnailDatabase db(NULL);
 
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
 
   db.BeginTransaction();
 
-  // Build a database mapping kPageUrl1 -> kIconUrl1, kPageUrl2 ->
-  // kIconUrl2, kPageUrl3 -> kIconUrl1, and kPageUrl5 -> kIconUrl5.
-  // Then retain kPageUrl1, kPageUrl3, and kPageUrl5.  kPageUrl2
-  // should go away, but the others should be retained correctly.
+  // Build a database mapping
+  // kPageUrl1 -> kIconUrl1
+  // kPageUrl2 -> kIconUrl2
+  // kPageUrl3 -> kIconUrl1
+  // kPageUrl4 -> kIconUrl1
+  // kPageUrl5 -> kIconUrl5
+  // Then retain kPageUrl1, kPageUrl3, and kPageUrl5. kPageUrl2
+  // and kPageUrl4 should go away, but the others should be retained
+  // correctly.
 
   // TODO(shess): This would probably make sense as a golden file.
 
   scoped_refptr<base::RefCountedStaticMemory> favicon1(
       new base::RefCountedStaticMemory(kBlob1, sizeof(kBlob1)));
   scoped_refptr<base::RefCountedStaticMemory> favicon2(
       new base::RefCountedStaticMemory(kBlob2, sizeof(kBlob2)));
 
   favicon_base::FaviconID kept_id1 =
       db.AddFavicon(kIconUrl1, favicon_base::FAVICON);
   db.AddFaviconBitmap(kept_id1, favicon1, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl1, kept_id1);
   db.AddIconMapping(kPageUrl3, kept_id1);
+  db.AddIconMapping(kPageUrl4, kept_id1);
 
   favicon_base::FaviconID unkept_id =
       db.AddFavicon(kIconUrl2, favicon_base::FAVICON);
   db.AddFaviconBitmap(unkept_id, favicon1, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl2, unkept_id);
 
   favicon_base::FaviconID kept_id2 =
       db.AddFavicon(kIconUrl5, favicon_base::FAVICON);
   db.AddFaviconBitmap(kept_id2, favicon2, base::Time::Now(), kLargeSize);
   db.AddIconMapping(kPageUrl5, kept_id2);
@@ skipping 24 matching lines @@
                                sizeof(kBlob1),
                                kBlob1));
   EXPECT_TRUE(CheckPageHasIcon(&db,
                                kPageUrl5,
                                favicon_base::FAVICON,
                                kIconUrl5,
                                kLargeSize,
                                sizeof(kBlob2),
                                kBlob2));
 
-  // The one not retained should be missing.
+  // The ones not retained should be missing.
   EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl2, false, NULL));
+  EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl4, false, NULL));
 
   // Schema should be the same.
   EXPECT_EQ(original_schema, db.db_.GetSchema());
 }
 
 // Tests that deleting a favicon deletes the favicon row and favicon bitmap
 // rows from the database.
 TEST_F(ThumbnailDatabaseTest, DeleteFavicon) {
   ThumbnailDatabase db(NULL);
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
@@ skipping 640 matching lines @@
     ThumbnailDatabase db(NULL);
     ASSERT_EQ(sql::INIT_OK, db.Init(db_path));
 
     // Verify that the resulting schema is correct, whether it
     // involved razing the file or fixing things in place.
     VerifyTablesAndColumns(&db.db_);
   }
 }
 
 }  // namespace history