| Index: chrome/browser/history/history_service.h
|
| diff --git a/chrome/browser/history/history_service.h b/chrome/browser/history/history_service.h
|
| index 8b2b4b01368861db6b72f42e16822d128e2537a8..deedc9d521cce10e3ac589e755061c6f1fad8354 100644
|
| --- a/chrome/browser/history/history_service.h
|
| +++ b/chrome/browser/history/history_service.h
|
| @@ -446,8 +446,9 @@ class HistoryService : public syncer::SyncableService,
|
|
|
| // Schedules a HistoryDBTask for running on the history backend thread. See
|
| // HistoryDBTask for details on what this does. Takes ownership of |task|.
|
| - virtual void ScheduleDBTask(scoped_ptr<history::HistoryDBTask> task,
|
| - base::CancelableTaskTracker* tracker);
|
| + virtual base::CancelableTaskTracker::TaskId ScheduleDBTask(
|
| + scoped_ptr<history::HistoryDBTask> task,
|
| + base::CancelableTaskTracker* tracker);
|
|
|
| // This callback is invoked when favicon change for urls.
|
| typedef base::Callback<void(const std::set<GURL>&)> OnFaviconChangedCallback;
|
| @@ -527,9 +528,6 @@ class HistoryService : public syncer::SyncableService,
|
|
|
| private:
|
| class BackendDelegate;
|
| -#if defined(OS_ANDROID)
|
| - friend class AndroidHistoryProviderService;
|
| -#endif
|
| friend class base::RefCountedThreadSafe<HistoryService>;
|
| friend class BackendDelegate;
|
| friend class FaviconService;
|
|
|