sync: Process 'control' data separately

sync/test/engine/syncer_command_test.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #define SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_
 #pragma once
 
 #include <algorithm>
 #include <string>
@@ skipping 175 matching lines @@
       const ModelChangingSyncerCommand& command,
       ModelSafeGroup group1, ModelSafeGroup group2, ModelSafeGroup group3) {
     std::set<ModelSafeGroup> expected_groups_to_change;
     expected_groups_to_change.insert(group1);
     expected_groups_to_change.insert(group2);
     expected_groups_to_change.insert(group3);
     EXPECT_EQ(expected_groups_to_change,
               command.GetGroupsToChangeForTest(*session()));
   }
 
+  void ExpectGroupsToChange(
+      const ModelChangingSyncerCommand& command,
+      ModelSafeGroup group1, ModelSafeGroup group2,
+      ModelSafeGroup group3, ModelSafeGroup group4) {
+    std::set<ModelSafeGroup> expected_groups_to_change;
+    expected_groups_to_change.insert(group1);
+    expected_groups_to_change.insert(group2);
+    expected_groups_to_change.insert(group3);
+    expected_groups_to_change.insert(group4);
+    EXPECT_EQ(expected_groups_to_change,
+              command.GetGroupsToChangeForTest(*session()));
+  }
+
  private:
   MessageLoop message_loop_;
   scoped_ptr<sessions::SyncSessionContext> context_;
   scoped_ptr<MockConnectionManager> mock_server_;
   scoped_ptr<sessions::SyncSession> session_;
   std::vector<scoped_refptr<ModelSafeWorker> > workers_;
   ModelSafeRoutingInfo routing_info_;
   NiceMock<MockDebugInfoGetter> mock_debug_info_getter_;
   FakeExtensionsActivityMonitor extensions_activity_monitor_;
   scoped_ptr<ThrottledDataTypeTracker> throttled_data_type_tracker_;
@@ skipping 23 matching lines @@
 
   virtual void SetUp() OVERRIDE;
 
   TestUnrecoverableErrorHandler handler_;
   MockDirectory mock_directory_;
 };
 
 }  // namespace csync
 
 #endif  // SYNC_TEST_ENGINE_SYNCER_COMMAND_TEST_H_