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

Unified Diff: chrome/browser/sync/js/js_sync_manager_observer_unittest.cc

Issue 7926001: [Sync] Move change-related methods out of SyncManager::Observer (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
Index: chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
diff --git a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
index 5c33a5f9ada848728b76a9a4b8e03f6eee0363ab..026a41c53a5ea19a44edb30ff2c89b71ddc00ac8 100644
--- a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
@@ -20,6 +20,7 @@
#include "chrome/browser/sync/protocol/sync_protocol_error.h"
#include "chrome/browser/sync/sessions/session_state.h"
#include "chrome/browser/sync/syncable/model_type.h"
+#include "chrome/browser/sync/syncable/syncable.h"
#include "chrome/browser/sync/test/engine/test_user_share.h"
#include "chrome/browser/sync/util/weak_handle.h"
#include "testing/gtest/include/gtest/gtest.h"
@@ -332,7 +333,8 @@ TEST_F(JsSyncManagerObserverTest, OnChangesApplied) {
expected_details.Set("changes", expected_changes);
for (int j = i; j < syncable::MODEL_TYPE_COUNT; ++j) {
sync_api::ReadTransaction trans(FROM_HERE, test_user_share.user_share());
- expected_changes->Append(changes[j].ToValue(&trans));
+ expected_changes->Append(changes[j].ToValue(
+ syncable::ImmutableEntryKernelMutationMap()));
}
EXPECT_CALL(mock_js_event_handler_,
HandleJsEvent("onChangesApplied",
@@ -347,7 +349,7 @@ TEST_F(JsSyncManagerObserverTest, OnChangesApplied) {
local_changes(changes + i, changes + arraysize(changes));
js_sync_manager_observer_.OnChangesApplied(
syncable::ModelTypeFromInt(i),
- &trans,
+ syncable::ImmutableEntryKernelMutationMap(),
sync_api::ImmutableChangeRecordList(&local_changes));
}

Powered by Google App Engine
This is Rietveld 408576698