summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/engine/process_updates_command.h
diff options
context:
space:
mode:
authornick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 17:41:51 +0000
committernick@chromium.org <nick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-02-09 17:41:51 +0000
commitf466a30ddd61518eb511aad85b71b2ccd231e4ee (patch)
tree3332901f74108b6fa0f3592893fc4a7a400936fe /chrome/browser/sync/engine/process_updates_command.h
parentbe63d2855bad91d9be16c78742dc3616b5d5748c (diff)
downloadchromium_src-f466a30ddd61518eb511aad85b71b2ccd231e4ee.zip
chromium_src-f466a30ddd61518eb511aad85b71b2ccd231e4ee.tar.gz
chromium_src-f466a30ddd61518eb511aad85b71b2ccd231e4ee.tar.bz2
Fix a bug where positions inside of a newly-committed folder would be
reversed if the children of the folder weren't committed in the same batch as the folder. Refactor ApplyUpdatesCommandTest, pulling out functionality that would be useful for any SyncerCommand test, into syncer_command_test.h. Add a test case for ProcessCommitResponseCommand using the new SyncerCommandTest framework. Add a test for the bug. BUG=33081 TEST=sync_unit_tests. Also, manual testing, using the reduced repro instructions described in comment #26 of the bug. Review URL: http://codereview.chromium.org/572021 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@38472 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/engine/process_updates_command.h')
-rw-r--r--chrome/browser/sync/engine/process_updates_command.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome/browser/sync/engine/process_updates_command.h b/chrome/browser/sync/engine/process_updates_command.h
index 27f3814..6eb4333 100644
--- a/chrome/browser/sync/engine/process_updates_command.h
+++ b/chrome/browser/sync/engine/process_updates_command.h
@@ -32,10 +32,11 @@ class ProcessUpdatesCommand : public ModelChangingSyncerCommand {
// ModelChangingSyncerCommand implementation.
virtual void ModelChangingExecuteImpl(sessions::SyncSession* session);
+
+ private:
ServerUpdateProcessingResult ProcessUpdate(
const syncable::ScopedDirLookup& dir,
const sync_pb::SyncEntity& pb_entry);
- private:
DISALLOW_COPY_AND_ASSIGN(ProcessUpdatesCommand);
};