bookmarks: Get rid of the dependency on history_notifications.h

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/stringprintf.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/bookmarks/bookmark_service.h"
+#include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/history/android/android_time.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_notification_types.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 "chrome/test/base/ui_test_utils.h"
 #include "content/public/browser/browser_thread.h"
@@ skipping 32 matching lines @@
                                   sql::InitStatus init_status) OVERRIDE {}
   virtual void SetInMemoryBackend(int backend_id,
                                   InMemoryHistoryBackend* backend) OVERRIDE {}
   virtual void BroadcastNotifications(int type,
                                       HistoryDetails* details) OVERRIDE {
     switch (type) {
       case chrome::NOTIFICATION_HISTORY_URLS_DELETED:
         deleted_details_.reset(static_cast<URLsDeletedDetails*>(details));
         break;
       case chrome::NOTIFICATION_FAVICON_CHANGED:
-        favicon_details_.reset(static_cast<FaviconChangeDetails*>(details));
+        favicon_details_.reset(static_cast<FaviconChangedDetails*>(details));
         break;
       case chrome::NOTIFICATION_HISTORY_URLS_MODIFIED:
         modified_details_.reset(static_cast<URLsModifiedDetails*>(details));
         break;
     }
   }
   virtual void DBLoaded(int backend_id) OVERRIDE {}
   virtual void StartTopSitesMigration(int backend_id) 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();
   }
 
-  FaviconChangeDetails* favicon_details() const {
+  FaviconChangedDetails* favicon_details() const {
     return favicon_details_.get();
   }
 
   void ResetDetails() {
     deleted_details_.reset();
     modified_details_.reset();
     favicon_details_.reset();
   }
 
  private:
   scoped_ptr<URLsDeletedDetails> deleted_details_;
   scoped_ptr<URLsModifiedDetails> modified_details_;
-  scoped_ptr<FaviconChangeDetails> favicon_details_;
+  scoped_ptr<FaviconChangedDetails> favicon_details_;
 
   DISALLOW_COPY_AND_ASSIGN(AndroidProviderBackendDelegate);
 };
 
 class AndroidProviderBackendTest : public testing::Test {
  public:
   AndroidProviderBackendTest()
       : profile_manager_(
           TestingBrowserProcess::GetGlobal()),
         bookmark_model_(NULL),
@@ skipping 1956 matching lines @@
                                                  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());
 }
 
 }  // namespace history