bookmarks: Get rid of the dependency on history_notifications.h

chrome/browser/history/android/android_provider_backend.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 "base/i18n/case_conversion.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/android/android_urls_sql_handler.h"
 #include "chrome/browser/history/android/bookmark_model_sql_handler.h"
 #include "chrome/browser/history/android/favicon_sql_handler.h"
 #include "chrome/browser/history/android/urls_sql_handler.h"
 #include "chrome/browser/history/android/visit_sql_handler.h"
 #include "chrome/browser/history/history_backend.h"
 #include "chrome/browser/history/history_database.h"
 #include "chrome/browser/history/thumbnail_database.h"
 #include "chrome/common/chrome_notification_types.h"
@@ skipping 308 matching lines @@
   for (std::vector<SQLHandler*>::iterator i =
        sql_handlers_.begin(); i != sql_handlers_.end(); ++i) {
     if ((*i)->HasColumnIn(row)) {
       if (!(*i)->Update(row, ids_set))
         return false;
     }
   }
   *updated_count = ids_set.size();
 
   scoped_ptr<URLsModifiedDetails> modified(new URLsModifiedDetails);
-  scoped_ptr<FaviconChangeDetails> favicon(new FaviconChangeDetails);
+  scoped_ptr<FaviconChangedDetails> favicon(new FaviconChangedDetails);
 
   for (TableIDRows::const_iterator i = ids_set.begin(); i != ids_set.end();
        ++i) {
     if (row.is_value_set_explicitly(HistoryAndBookmarkRow::TITLE) ||
         row.is_value_set_explicitly(HistoryAndBookmarkRow::VISIT_COUNT) ||
         row.is_value_set_explicitly(HistoryAndBookmarkRow::LAST_VISIT_TIME)) {
       URLRow url_row;
       if (!history_db_->GetURLRow(i->url_id, &url_row))
         return false;
       modified->changed_urls.push_back(url_row);
@@ skipping 35 matching lines @@
 
   URLRow url_row;
   if (!history_db_->GetURLRow(row.url_id(), &url_row))
     return false;
 
   scoped_ptr<URLsModifiedDetails> modified(new URLsModifiedDetails);
   if (!modified.get())
     return false;
   modified->changed_urls.push_back(url_row);
 
-  scoped_ptr<FaviconChangeDetails> favicon;
+  scoped_ptr<FaviconChangedDetails> favicon;
   // No favicon should be changed if the thumbnail_db_ is not available.
   if (row.is_value_set_explicitly(HistoryAndBookmarkRow::FAVICON) &&
       row.favicon_valid() && thumbnail_db_) {
-    favicon.reset(new FaviconChangeDetails);
+    favicon.reset(new FaviconChangedDetails);
     if (!favicon.get())
       return false;
     favicon->urls.insert(url_row.url());
   }
 
   notifications->push_back(HistoryNotification(
       chrome::NOTIFICATION_HISTORY_URLS_MODIFIED, modified.release()));
   if (favicon.get())
     notifications->push_back(HistoryNotification(
         chrome::NOTIFICATION_FAVICON_CHANGED, favicon.release()));
@@ skipping 560 matching lines @@
 
   HistoryAndBookmarkRow new_row;
   new_row.set_last_visit_time(FromDatabaseTime(
       statement->statement()->ColumnInt64(0)));
   new_row.set_created(FromDatabaseTime(
       statement->statement()->ColumnInt64(1)));
   new_row.set_visit_count(statement->statement()->ColumnInt(2));
   new_row.set_title(statement->statement()->ColumnString16(3));
 
   scoped_ptr<URLsDeletedDetails> deleted_details(new URLsDeletedDetails);
-  scoped_ptr<FaviconChangeDetails> favicon_details(new FaviconChangeDetails);
+  scoped_ptr<FaviconChangedDetails> favicon_details(new FaviconChangedDetails);
   scoped_ptr<URLsModifiedDetails> modified(new URLsModifiedDetails);
   URLRow old_url_row;
   if (!history_db_->GetURLRow(ids[0].url_id, &old_url_row))
     return false;
   deleted_details->rows.push_back(old_url_row);
 
   chrome::FaviconID favicon_id = statement->statement()->ColumnInt64(4);
   if (favicon_id) {
     std::vector<FaviconBitmap> favicon_bitmaps;
     if (!thumbnail_db_ ||
@@ skipping 108 matching lines @@
   }
   sql::Statement* result = statement.release();
   return new AndroidStatement(result, replaced_index);
 }
 
 bool AndroidProviderBackend::DeleteHistoryInternal(
     const TableIDRows& urls,
     bool delete_bookmarks,
     HistoryNotifications* notifications) {
   scoped_ptr<URLsDeletedDetails> deleted_details(new URLsDeletedDetails);
-  scoped_ptr<FaviconChangeDetails> favicon(new FaviconChangeDetails);
+  scoped_ptr<FaviconChangedDetails> favicon(new FaviconChangedDetails);
   for (TableIDRows::const_iterator i = urls.begin(); i != urls.end(); ++i) {
     URLRow url_row;
     if (!history_db_->GetURLRow(i->url_id, &url_row))
       return false;
     deleted_details->rows.push_back(url_row);
     if (thumbnail_db_ &&
         thumbnail_db_->GetIconMappingsForPageURL(url_row.url(), NULL))
       favicon->urls.insert(url_row.url());
   }
 
@@ skipping 68 matching lines @@
       return false;
 
     if (!history_db_->SetKeywordSearchTermsForURL(bookmark_row.url_id(),
                           values.template_url_id(), values.search_term()))
       return false;
   }
   return true;
 }
 
 }  // namespace history