[Refactor] Simplify HistoryBackend::UpdateFaviconMappingsAndFetchImpl() signature

components/history/core/browser/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 <stddef.h>
 
 #include <algorithm>
 #include <vector>
 
 #include "base/files/file_enumerator.h"
@@ skipping 351 matching lines @@
                                kBlob1));
   EXPECT_TRUE(CheckPageHasIcon(&db,
                                kPageUrl5,
                                favicon_base::FAVICON,
                                kIconUrl5,
                                kLargeSize,
                                sizeof(kBlob2),
                                kBlob2));
 
   // The ones not retained should be missing.
-  EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl2, false, NULL));
-  EXPECT_FALSE(db.GetFaviconIDForFaviconURL(kPageUrl4, false, NULL));
+  EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl2, nullptr));
+  EXPECT_FALSE(db.GetIconMappingsForPageURL(kPageUrl4, nullptr));
 
   // Schema should be the same.
   EXPECT_EQ(original_schema, db.db_.GetSchema());
 }
 
 // Test that RetainDataForPageUrls() expires retained favicons.
 TEST_F(ThumbnailDatabaseTest, RetainDataForPageUrlsExpiresRetainedFavicons) {
   ThumbnailDatabase db(NULL);
   ASSERT_EQ(sql::INIT_OK, db.Init(file_name_));
   db.BeginTransaction();
 
   scoped_refptr<base::RefCountedStaticMemory> favicon1(
       new base::RefCountedStaticMemory(kBlob1, sizeof(kBlob1)));
   favicon_base::FaviconID kept_id = db.AddFavicon(
       kIconUrl1, favicon_base::FAVICON, favicon1, base::Time::Now(),
       gfx::Size());
   db.AddIconMapping(kPageUrl1, kept_id);
 
   EXPECT_TRUE(db.RetainDataForPageUrls(std::vector<GURL>(1u, kPageUrl1)));
 
-  favicon_base::FaviconID new_favicon_id = db.GetFaviconIDForFaviconURL(
-      kIconUrl1, favicon_base::FAVICON, nullptr);
+  favicon_base::FaviconID new_favicon_id =
+      db.GetFaviconIDForFaviconURL(kIconUrl1, favicon_base::FAVICON);
   ASSERT_NE(0, new_favicon_id);
   std::vector<FaviconBitmap> new_favicon_bitmaps;
   db.GetFaviconBitmaps(new_favicon_id, &new_favicon_bitmaps);
 
   ASSERT_EQ(1u, new_favicon_bitmaps.size());
   EXPECT_EQ(0, new_favicon_bitmaps[0].last_updated.ToInternalValue());
 }
 
 // Tests that deleting a favicon deletes the favicon row and favicon bitmap
 // rows from the database.
@@ skipping 674 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