| Index: chrome/browser/history/history.h
|
| diff --git a/chrome/browser/history/history.h b/chrome/browser/history/history.h
|
| index a60add5cc4b0862b314c49a6b8ea62b9a1cfdbd2..34612bcdb492bfd71d3635cd21923ec92cc2ab91 100644
|
| --- a/chrome/browser/history/history.h
|
| +++ b/chrome/browser/history/history.h
|
| @@ -9,8 +9,10 @@
|
| #include <vector>
|
|
|
| #include "base/basictypes.h"
|
| +#include "base/bind.h"
|
| #include "base/callback.h"
|
| #include "base/file_path.h"
|
| +#include "base/logging.h"
|
| #include "base/memory/ref_counted.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "base/memory/weak_ptr.h"
|
| @@ -623,6 +625,9 @@ class HistoryService : public CancelableRequestProvider,
|
|
|
| base::WeakPtr<HistoryService> AsWeakPtr();
|
|
|
| + void ProcessDeleteDirectiveForTest(
|
| + const sync_pb::HistoryDeleteDirectiveSpecifics& delete_directive);
|
| +
|
| // syncer::SyncableService implementation.
|
| virtual syncer::SyncMergeResult MergeDataAndStartSyncing(
|
| syncer::ModelType type,
|
| @@ -855,6 +860,10 @@ class HistoryService : public CancelableRequestProvider,
|
| void ProcessDeleteDirective(
|
| const sync_pb::HistoryDeleteDirectiveSpecifics& delete_directive);
|
|
|
| + // Called when a delete directive has been processed.
|
| + void OnDeleteDirectiveProcessed(
|
| + const sync_pb::HistoryDeleteDirectiveSpecifics& delete_directive);
|
| +
|
| // Schedule ------------------------------------------------------------------
|
| //
|
| // Functions for scheduling operations on the history thread that have a
|
|
|