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

Unified Diff: chrome/browser/sync/glue/change_processor_mock.h

Issue 7918001: [Sync] Move ChangeRecord into its own file (change_record.{h,cc}) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 9 years, 3 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
« no previous file with comments | « chrome/browser/sync/glue/change_processor.h ('k') | chrome/browser/sync/glue/generic_change_processor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/sync/glue/change_processor_mock.h
diff --git a/chrome/browser/sync/glue/change_processor_mock.h b/chrome/browser/sync/glue/change_processor_mock.h
index 8ff861368e53f318f18ad8f8df2e03c8a9ba4cdf..2a84ab3bc835c4a6b49fc6f575fb3676b9717ad0 100644
--- a/chrome/browser/sync/glue/change_processor_mock.h
+++ b/chrome/browser/sync/glue/change_processor_mock.h
@@ -7,7 +7,6 @@
#pragma once
#include "chrome/browser/sync/glue/change_processor.h"
-#include "chrome/browser/sync/internal_api/sync_manager.h"
#include "chrome/browser/sync/syncable/syncable.h"
#include "chrome/browser/sync/unrecoverable_error_handler.h"
#include "testing/gmock/include/gmock/gmock.h"
@@ -19,11 +18,11 @@ class ChangeProcessorMock
public:
ChangeProcessorMock();
virtual ~ChangeProcessorMock();
- MOCK_METHOD3(ApplyChangesFromSyncModel,
- void(const sync_api::BaseTransaction* trans,
- const sync_api::SyncManager::ChangeRecord* changes,
- int change_count));
- MOCK_METHOD1(StartImpl, void(Profile* profile));
+ MOCK_METHOD2(ApplyChangesFromSyncModel,
+ void(const sync_api::BaseTransaction*,
+ const sync_api::ImmutableChangeRecordList&));
+ MOCK_METHOD0(CommitChangesFromSyncModel, void());
+ MOCK_METHOD1(StartImpl, void(Profile*));
MOCK_METHOD0(StopImpl, void());
MOCK_CONST_METHOD0(IsRunning, bool());
MOCK_METHOD2(OnUnrecoverableError, void(const tracked_objects::Location&,
« no previous file with comments | « chrome/browser/sync/glue/change_processor.h ('k') | chrome/browser/sync/glue/generic_change_processor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698