Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(662)

Unified Diff: chrome/browser/history/history_service.cc

Issue 930363002: Remove adapter method on HistoryBackend delegating to AndroidProviderBackend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/history/history_service.cc
diff --git a/chrome/browser/history/history_service.cc b/chrome/browser/history/history_service.cc
index 2e25db82903fd0a3a301c3dd7634c40acababbb5..a14daae0f0c21e2c21e430eced6b967c5408313b 100644
--- a/chrome/browser/history/history_service.cc
+++ b/chrome/browser/history/history_service.cc
@@ -329,15 +329,17 @@ void HistoryService::RemoveObserver(history::HistoryServiceObserver* observer) {
observers_.RemoveObserver(observer);
}
-void HistoryService::ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
- base::CancelableTaskTracker* tracker) {
+base::CancelableTaskTracker::TaskId HistoryService::ScheduleDBTask(
+ scoped_ptr<history::HistoryDBTask> task,
+ base::CancelableTaskTracker* tracker) {
DCHECK(thread_) << "History service being called after cleanup";
DCHECK(thread_checker_.CalledOnValidThread());
base::CancelableTaskTracker::IsCanceledCallback is_canceled;
- tracker->NewTrackedTaskId(&is_canceled);
+ base::CancelableTaskTracker::TaskId task_id =
+ tracker->NewTrackedTaskId(&is_canceled);
// Use base::ThreadTaskRunnerHandler::Get() to get a message loop proxy to
// the current message loop so that we can forward the call to the method
- // HistoryDBTask::DoneRunOnMainThread in the correct thread.
+ // HistoryDBTask::DoneRunOnMainThread() in the correct thread.
thread_->message_loop_proxy()->PostTask(
FROM_HERE,
base::Bind(&HistoryBackend::ProcessDBTask,
@@ -345,6 +347,7 @@ void HistoryService::ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
base::Passed(&task),
base::ThreadTaskRunnerHandle::Get(),
is_canceled));
+ return task_id;
}
void HistoryService::FlushForTest(const base::Closure& flushed) {
« no previous file with comments | « chrome/browser/history/history_service.h ('k') | chrome/browser/sync/profile_sync_service_typed_url_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698