Refactor HistoryService to not send NOTIFICATION_FAVICON_CHANGED

chrome/browser/history/android/android_provider_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 "chrome/browser/history/android/android_provider_backend.h"
 
 #include <vector>
 
 #include "base/file_util.h"
 #include "base/files/file_path.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/memory/ref_counted.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/chrome_history_client.h"
 #include "chrome/browser/history/chrome_history_client_factory.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/bookmarks/browser/bookmark_model.h"
@@ skipping 29 matching lines @@
 
 }  // namespace
 
 class AndroidProviderBackendDelegate : public HistoryBackend::Delegate {
  public:
   AndroidProviderBackendDelegate() {}
 
   virtual void NotifyProfileError(sql::InitStatus init_status) OVERRIDE {}
   virtual void SetInMemoryBackend(
       scoped_ptr<InMemoryHistoryBackend> backend) OVERRIDE {}
+  virtual void NotifyFaviconChanged(const std::set<GURL>& url) OVERRIDE {
+    favicon_changed_.reset(new std::set<GURL>(url.begin(), url.end()));
+  }
   virtual void BroadcastNotifications(
       int type,
       scoped_ptr<HistoryDetails> details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_HISTORY_URLS_DELETED:
         deleted_details_.reset(
             static_cast<URLsDeletedDetails*>(details.release()));
         break;
-      case chrome::NOTIFICATION_FAVICON_CHANGED:
-        favicon_details_.reset(
-            static_cast<FaviconChangedDetails*>(details.release()));
-        break;
       case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
         modified_details_.reset(
             static_cast<URLsModifiedDetails*>(details.release()));
         break;
+      default:
+        NOTREACHED() << "Unexpected notification type: " << type;
     }
   }
   virtual void DBLoaded() OVERRIDE {}
   virtual void NotifyVisitDBObserversOnAddVisit(
       const history::BriefVisitInfo& info) OVERRIDE {}
 
   URLsDeletedDetails* deleted_details() const {
     return deleted_details_.get();
   }
 
   URLsModifiedDetails* modified_details() const {
     return modified_details_.get();
   }
 
-  FaviconChangedDetails* favicon_details() const {
-    return favicon_details_.get();
-  }
+  std::set<GURL>* favicon_changed() const { return favicon_changed_.get(); }
 
   void ResetDetails() {
     deleted_details_.reset();
     modified_details_.reset();
-    favicon_details_.reset();
+    favicon_changed_.reset();
   }
 
  private:
   scoped_ptr<URLsDeletedDetails> deleted_details_;
   scoped_ptr<URLsModifiedDetails> modified_details_;
-  scoped_ptr<FaviconChangedDetails> favicon_details_;
+  scoped_ptr<std::set<GURL>> favicon_changed_;

[brettw, 2014/09/02 23:23:10]

Ditto on >>

[sdefresne, 2014/09/03 10:00:01]

Done.

 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendDelegate);
 };
 
 class AndroidProviderBackendTest : public testing::Test {
  public:
   AndroidProviderBackendTest()
       : thumbnail_db_(NULL),
         profile_manager_(
           TestingBrowserProcess::GetGlobal()),
@@ skipping 406 matching lines @@
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(), delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(row1.visit_count(),
             delegate_.modified_details()->changed_urls[0].visit_count());
   EXPECT_EQ(row1.title(),
             delegate_.modified_details()->changed_urls[0].title());
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row2.url(), delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(row2.last_visit_time(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(row2.title(),
             delegate_.modified_details()->changed_urls[0].title());
-  ASSERT_TRUE(delegate_.favicon_details());
-  ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(row2.url()));
+  ASSERT_TRUE(delegate_.favicon_changed());
+  ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(row2.url()));
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::TITLE);
   projections.push_back(HistoryAndBookmarkRow::CREATED);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
   projections.push_back(HistoryAndBookmarkRow::FAVICON);
   projections.push_back(HistoryAndBookmarkRow::BOOKMARK);
@@ skipping 89 matching lines @@
 
   // Verify notifications
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
   EXPECT_EQ(row1.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row1.title(),
             delegate_.deleted_details()->rows[0].title());
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::TITLE);
   projections.push_back(HistoryAndBookmarkRow::CREATED);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
   projections.push_back(HistoryAndBookmarkRow::FAVICON);
   projections.push_back(HistoryAndBookmarkRow::BOOKMARK);
@@ skipping 26 matching lines @@
                   std::vector<base::string16>(), &deleted_count));
   // Verify notifications
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(1u, delegate_.deleted_details()->rows.size());
   EXPECT_EQ(row2.url(), delegate_.deleted_details()->rows[0].url());
   EXPECT_EQ(row2.last_visit_time(),
             delegate_.deleted_details()->rows[0].last_visit());
   EXPECT_EQ(row2.title(),
             delegate_.deleted_details()->rows[0].title());
-  ASSERT_TRUE(delegate_.favicon_details());
-  ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(row2.url()));
+  ASSERT_TRUE(delegate_.favicon_changed());
+  ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(row2.url()));
 
   ASSERT_EQ(1, deleted_count);
   scoped_ptr<AndroidStatement> statement1(backend->QueryHistoryAndBookmarks(
       projections, std::string(), std::vector<base::string16>(),
       std::string("url ASC")));
   ASSERT_FALSE(statement1->statement()->Step());
 }
 
 TEST_F(AndroidProviderBackendTest, IsValidHistoryAndBookmarkRow) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
@@ skipping 151 matching lines @@
             delegate_.deleted_details()->rows[0].title());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(update_row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(row1.last_visit_time()),
             ToDatabaseTime(
                 delegate_.modified_details()->changed_urls[0].last_visit()));
   EXPECT_EQ(row1.title(),
             delegate_.modified_details()->changed_urls[0].title());
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 
   EXPECT_EQ(1, update_count);
   // We shouldn't find orignal url anymore.
   EXPECT_FALSE(history_db_.GetRowForURL(row1.url(), NULL));
   visits.clear();
   EXPECT_TRUE(history_db_.GetVisitsForURL(url_id1, &visits));
   EXPECT_EQ(0u, visits.size());
   // Verify new URL.
   URLRow new_row;
   EXPECT_TRUE(history_db_.GetRowForURL(update_row1.url(), &new_row));
@@ skipping 39 matching lines @@
             delegate_.deleted_details()->rows[0].title());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(update_row2.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(update_row2.last_visit_time()),
             ToDatabaseTime(
                 delegate_.modified_details()->changed_urls[0].last_visit()));
   EXPECT_EQ(update_row2.visit_count(),
             delegate_.modified_details()->changed_urls[0].visit_count());
-  ASSERT_TRUE(delegate_.favicon_details());
-  ASSERT_EQ(2u, delegate_.favicon_details()->urls.size());
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(row2.url()));
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(update_row2.url()));
+  ASSERT_TRUE(delegate_.favicon_changed());
+  ASSERT_EQ(2u, delegate_.favicon_changed()->size());
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(row2.url()));
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(update_row2.url()));
 
   EXPECT_EQ(1, update_count);
   // We shouldn't find orignal url anymore.
   EXPECT_FALSE(history_db_.GetRowForURL(row2.url(), NULL));
   visits.clear();
   EXPECT_TRUE(history_db_.GetVisitsForURL(url_id2, &visits));
   EXPECT_EQ(0u, visits.size());
 
   // Verify new URL.
   URLRow new_row2;
@@ skipping 61 matching lines @@
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(row1.last_visit_time()),
             ToDatabaseTime(
                 delegate_.modified_details()->changed_urls[0].last_visit()));
   EXPECT_EQ(update_row1.visit_count(),
             delegate_.modified_details()->changed_urls[0].visit_count());
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 
   // All visits should be removed, and 5 new visit insertted.
   URLRow new_row1;
   ASSERT_TRUE(history_db_.GetRowForURL(row1.url(), &new_row1));
   EXPECT_EQ(5, new_row1.visit_count());
   VisitVector visits;
   ASSERT_TRUE(history_db_.GetVisitsForURL(new_row1.id(), &visits));
   ASSERT_EQ(5u, visits.size());
   EXPECT_EQ(row1.last_visit_time(), visits[4].visit_time);
   EXPECT_GT(row1.last_visit_time(), visits[0].visit_time);
@@ skipping 60 matching lines @@
                                                  update_args, &update_count));
   // Verify notifications, Update involves modified URL.
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(ToDatabaseTime(update_row1.last_visit_time()),
             ToDatabaseTime(
                 delegate_.modified_details()->changed_urls[0].last_visit()));
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 
   URLRow new_row1;
   ASSERT_TRUE(history_db_.GetRowForURL(row1.url(), &new_row1));
   EXPECT_EQ(11, new_row1.visit_count());
   EXPECT_EQ(update_row1.last_visit_time(), new_row1.last_visit());
   VisitVector visits;
   ASSERT_TRUE(history_db_.GetVisitsForURL(new_row1.id(), &visits));
   // 1 new visit insertted.
   ASSERT_EQ(11u, visits.size());
   EXPECT_EQ(update_row1.last_visit_time(), visits[10].visit_time);
@@ skipping 39 matching lines @@
   std::vector<unsigned char> data;
   data.push_back('1');
   update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
-  ASSERT_TRUE(delegate_.favicon_details());
-  ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(row1.url()));
+  ASSERT_TRUE(delegate_.favicon_changed());
+  ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(row1.url()));
 
   std::vector<IconMapping> icon_mappings;
   EXPECT_TRUE(thumbnail_db_.GetIconMappingsForPageURL(
       row1.url(), favicon_base::FAVICON, &icon_mappings));
   EXPECT_EQ(1u, icon_mappings.size());
   std::vector<FaviconBitmap> favicon_bitmaps;
   EXPECT_TRUE(thumbnail_db_.GetFaviconBitmaps(icon_mappings[0].icon_id,
                                               &favicon_bitmaps));
   EXPECT_EQ(1u, favicon_bitmaps.size());
   EXPECT_TRUE(favicon_bitmaps[0].bitmap_data.get());
   EXPECT_EQ(1u, favicon_bitmaps[0].bitmap_data->size());
   EXPECT_EQ('1', *favicon_bitmaps[0].bitmap_data->front());
 
   // Remove favicon.
   HistoryAndBookmarkRow update_row2;
 
   // Set favicon.
   update_row1.set_favicon(new base::RefCountedBytes());
   update_args.clear();
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
-  ASSERT_TRUE(delegate_.favicon_details());
-  ASSERT_EQ(1u, delegate_.favicon_details()->urls.size());
-  ASSERT_TRUE(delegate_.favicon_details()->urls.end() !=
-              delegate_.favicon_details()->urls.find(row1.url()));
+  ASSERT_TRUE(delegate_.favicon_changed());
+  ASSERT_EQ(1u, delegate_.favicon_changed()->size());
+  ASSERT_TRUE(delegate_.favicon_changed()->end() !=
+              delegate_.favicon_changed()->find(row1.url()));
 
   EXPECT_FALSE(thumbnail_db_.GetIconMappingsForPageURL(
       row1.url(), favicon_base::FAVICON, NULL));
 }
 
 TEST_F(AndroidProviderBackendTest, UpdateSearchTermTable) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
@@ skipping 429 matching lines @@
   EXPECT_EQ(row1.title(), child1->GetTitle());
   EXPECT_EQ(row1.url(), child1->url());
 
   // Verify notification
   ASSERT_TRUE(delegate_.deleted_details());
   ASSERT_EQ(2u, delegate_.deleted_details()->rows.size());
   EXPECT_EQ(row1.url(),
             delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(Time::UnixEpoch(),
             delegate_.modified_details()->changed_urls[0].last_visit());
-  EXPECT_EQ(1u, delegate_.favicon_details()->urls.size());
+  EXPECT_EQ(1u, delegate_.favicon_changed()->size());
 }
 
 TEST_F(AndroidProviderBackendTest, TestMultipleNestingTransaction) {
   ASSERT_EQ(sql::INIT_OK, history_db_.Init(history_db_name_));
   ASSERT_EQ(sql::INIT_OK, thumbnail_db_.Init(thumbnail_db_name_));
   scoped_ptr<AndroidProviderBackend> backend(
       new AndroidProviderBackend(android_cache_db_name_,
                                  &history_db_,
                                  &thumbnail_db_,
                                  history_client_,
@@ skipping 286 matching lines @@
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row1.url(), delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(row1.last_visit_time(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(row1.visit_count(),
             delegate_.modified_details()->changed_urls[0].visit_count());
   EXPECT_EQ(row1.title(),
             delegate_.modified_details()->changed_urls[0].title());
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(1, bookmark_model_->mobile_node()->child_count());
   const BookmarkNode* child = bookmark_model_->mobile_node()->GetChild(0);
   ASSERT_TRUE(child);
   EXPECT_EQ(row1.title(), child->GetTitle());
   EXPECT_EQ(row1.url(), child->url());
 
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->InsertHistoryAndBookmark(row2));
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   EXPECT_EQ(row2.url(), delegate_.modified_details()->changed_urls[0].url());
   EXPECT_EQ(row2.last_visit_time(),
             delegate_.modified_details()->changed_urls[0].last_visit());
   EXPECT_EQ(row2.title(),
             delegate_.modified_details()->changed_urls[0].title());
   // Favicon details is still false because thumbnail database wasn't
   // initialized, we ignore any changes of favicon.
-  ASSERT_FALSE(delegate_.favicon_details());
+  ASSERT_FALSE(delegate_.favicon_changed());
 }
 
 TEST_F(AndroidProviderBackendTest, DeleteWithoutThumbnailDB) {
   HistoryAndBookmarkRow row1;
   row1.set_raw_url("cnn.com");
   row1.set_url(GURL("http://cnn.com"));
   row1.set_last_visit_time(Time::Now() - TimeDelta::FromDays(1));
   row1.set_created(Time::Now() - TimeDelta::FromDays(20));
   row1.set_visit_count(10);
   row1.set_is_bookmark(true);
@@ skipping 50 matching lines @@
   EXPECT_EQ(2, deleted_count);
   // Verify the rows was removed from bookmark model.
   content::RunAllPendingInMessageLoop();
   ASSERT_EQ(0, bookmark_model_->mobile_node()->child_count());
 
   // Verify notifications
   ASSERT_TRUE(delegate_.deleted_details());
   EXPECT_FALSE(delegate_.modified_details());
   EXPECT_EQ(2u, delegate_.deleted_details()->rows.size());
   // No favicon has been deleted.
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 
   // No row exists.
   std::vector<HistoryAndBookmarkRow::ColumnID> projections;
   projections.push_back(HistoryAndBookmarkRow::ID);
   projections.push_back(HistoryAndBookmarkRow::URL);
   projections.push_back(HistoryAndBookmarkRow::TITLE);
   projections.push_back(HistoryAndBookmarkRow::CREATED);
   projections.push_back(HistoryAndBookmarkRow::LAST_VISIT_TIME);
   projections.push_back(HistoryAndBookmarkRow::VISIT_COUNT);
   projections.push_back(HistoryAndBookmarkRow::FAVICON);
@@ skipping 52 matching lines @@
   update_row1.set_favicon(base::RefCountedBytes::TakeVector(&data));
   update_args.push_back(UTF8ToUTF16(row1.raw_url()));
   delegate_.ResetDetails();
   ASSERT_TRUE(backend->UpdateHistoryAndBookmarks(update_row1, "url = ?",
                                                  update_args, &update_count));
   // Verify notifications.
   EXPECT_FALSE(delegate_.deleted_details());
   ASSERT_TRUE(delegate_.modified_details());
   ASSERT_EQ(1u, delegate_.modified_details()->changed_urls.size());
   // No favicon will be updated as thumbnail database is missing.
-  EXPECT_FALSE(delegate_.favicon_details());
+  EXPECT_FALSE(delegate_.favicon_changed());
 }
 
 }  // namespace history