Change HistoryService::ScheduleAutocomplete interface

chrome/browser/history/history_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/history_backend.h"
 
 #include <algorithm>
 #include <functional>
 #include <list>
 #include <map>
 #include <set>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/compiler_specific.h"
 #include "base/files/file_enumerator.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/scoped_vector.h"
 #include "base/message_loop/message_loop.h"
 #include "base/metrics/histogram.h"
 #include "base/rand_util.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "chrome/browser/autocomplete/history_url_provider.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/favicon/favicon_changed_details.h"
 #include "chrome/browser/history/download_row.h"
 #include "chrome/browser/history/history_db_task.h"
 #include "chrome/browser/history/history_notifications.h"
 #include "chrome/browser/history/in_memory_history_backend.h"
 #include "chrome/browser/history/page_usage_data.h"
 #include "chrome/browser/history/top_sites.h"
 #include "chrome/browser/history/typed_url_syncable_service.h"
 #include "chrome/browser/history/visit_filter.h"
@@ skipping 1496 matching lines @@
 
   URLID to_url_id = db_->GetRowForURL(to_url, NULL);
   VisitID cur_visit = db_->GetMostRecentVisitForURL(to_url_id, NULL);
   if (!cur_visit)
     return false;  // No visits for URL.
 
   GetRedirectsToSpecificVisit(cur_visit, redirects);
   return true;
 }
 
-void HistoryBackend::ScheduleAutocomplete(HistoryURLProvider* provider,
-                                          HistoryURLProviderParams* params) {
+void HistoryBackend::ScheduleAutocomplete(const base::Callback<
+    void(history::HistoryBackend*, history::URLDatabase*)>& callback) {
   // ExecuteWithDB should handle the NULL database case.

[blundell, 2014/07/08 09:10:05]

This comment is out of date now; instead, the comment on the declaration should
specify that the callback must be able to handle the case where the database is
null.

[nshaik, 2014/07/08 18:53:49]

Done.

-  provider->ExecuteWithDB(this, db_.get(), params);
+  callback.Run(this, db_.get());
 }
 
 void HistoryBackend::DeleteFTSIndexDatabases() {
   // Find files on disk matching the text databases file pattern so we can
   // quickly test for and delete them.
   base::FilePath::StringType filepattern =
       FILE_PATH_LITERAL("History Index *");
   base::FileEnumerator enumerator(
       history_dir_, false, base::FileEnumerator::FILES, filepattern);
   int num_databases_deleted = 0;
@@ skipping 1274 matching lines @@
   int rank = kPageVisitStatsMaxTopSites;
   std::map<GURL, int>::const_iterator it = most_visited_urls_map_.find(url);
   if (it != most_visited_urls_map_.end())
     rank = (*it).second;
   UMA_HISTOGRAM_ENUMERATION("History.TopSitesVisitsByRank",
                             rank, kPageVisitStatsMaxTopSites + 1);
 }
 #endif
 
 }  // namespace history