sync: Per-type update application

sync/engine/download_unittest.cc

 // Copyright 2013 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.
 
 #include "sync/engine/download.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/sync_directory_update_handler.h"
 #include "sync/internal_api/public/base/model_type_test_util.h"
 #include "sync/protocol/sync.pb.h"
 #include "sync/sessions/debug_info_getter.h"
 #include "sync/sessions/nudge_tracker.h"
 #include "sync/sessions/status_controller.h"
 #include "sync/syncable/directory.h"
+#include "sync/test/engine/fake_model_worker.h"
 #include "sync/test/engine/test_directory_setter_upper.h"
 #include "sync/test/sessions/mock_debug_info_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
 using sessions::MockDebugInfoGetter;
 
 // A test fixture for tests exercising download updates functions.
 class DownloadUpdatesTest : public ::testing::Test {
  protected:
   DownloadUpdatesTest()
       : update_handler_map_deleter_(&update_handler_map_) {
   }
 
   virtual void SetUp() {
     dir_maker_.SetUp();
 
-    AddUpdateHandler(AUTOFILL);
-    AddUpdateHandler(BOOKMARKS);
-    AddUpdateHandler(PREFERENCES);
+    AddUpdateHandler(AUTOFILL, GROUP_DB);
+    AddUpdateHandler(BOOKMARKS, GROUP_UI);
+    AddUpdateHandler(PREFERENCES, GROUP_UI);
   }
 
   virtual void TearDown() {
     dir_maker_.TearDown();
   }
 
   ModelTypeSet proto_request_types() {
     ModelTypeSet types;
     for (UpdateHandlerMap::iterator it = update_handler_map_.begin();
          it != update_handler_map_.end(); ++it) {
       types.Put(it->first);
     }
     return types;
   }
 
   syncable::Directory* directory() {
     return dir_maker_.directory();
   }
 
   UpdateHandlerMap* update_handler_map() {
     return &update_handler_map_;
   }
 
  private:
-  void AddUpdateHandler(ModelType type) {
+  void AddUpdateHandler(ModelType type, ModelSafeGroup group) {
     DCHECK(directory());
-    update_handler_map_.insert(
-        std::make_pair(type,
-                       new SyncDirectoryUpdateHandler(directory(), type)));
+    scoped_refptr<ModelSafeWorker> worker = new FakeModelWorker(group);
+    SyncDirectoryUpdateHandler* handler =
+        new SyncDirectoryUpdateHandler(directory(), type, worker);
+    update_handler_map_.insert(std::make_pair(type, handler));
   }
 
   base::MessageLoop loop_;  // Needed for directory init.
   TestDirectorySetterUpper dir_maker_;
 
   UpdateHandlerMap update_handler_map_;
   STLValueDeleter<UpdateHandlerMap> update_handler_map_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesTest);
 };
@@ skipping 161 matching lines @@
 TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyOverwrites) {
   sync_pb::DebugInfo debug_info;
   AddDebugEvent();
   download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
   download::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
 }
 
 }  // namespace syncer