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

Unified Diff: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

Issue 930363002: Remove adapter method on HistoryBackend delegating to AndroidProviderBackend (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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/sync/profile_sync_service_typed_url_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
index 899b2206a0231c843aee5b58bd1fc562d084d32e..5c7f66af16cbcebe1577df10449637c4d7c79037 100644
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc
@@ -116,8 +116,9 @@ class HistoryServiceMock : public HistoryService {
HistoryServiceMock(history::HistoryClient* client, Profile* profile)
: HistoryService(client, profile), backend_(NULL) {}
- virtual void ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
- base::CancelableTaskTracker* tracker) override {
+ virtual base::CancelableTaskTracker::TaskId ScheduleDBTask(
+ scoped_ptr<history::HistoryDBTask> task,
+ base::CancelableTaskTracker* tracker) override {
history::HistoryDBTask* task_raw = task.get();
task_runner_->PostTaskAndReply(
FROM_HERE,
@@ -125,6 +126,7 @@ class HistoryServiceMock : public HistoryService {
base::Unretained(this), task_raw),
base::Bind(&base::DeletePointer<history::HistoryDBTask>,
task.release()));
+ return base::CancelableTaskTracker::kBadTaskId;
}
MOCK_METHOD0(Shutdown, void());

Powered by Google App Engine
This is Rietveld 408576698