sync: Add interfaces for per-type sync

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/get_updates_delegate.h"
-#include "sync/engine/sync_directory_update_handler.h"
+#include "sync/engine/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/engine/mock_update_handler.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() :
     kTestStartTime(base::TimeTicks::Now()),
     update_handler_deleter_(&update_handler_map_) {}
 
   virtual void SetUp() {
-    dir_maker_.SetUp();
-
-    AddUpdateHandler(AUTOFILL, GROUP_DB);
-    AddUpdateHandler(BOOKMARKS, GROUP_UI);
-    AddUpdateHandler(PREFERENCES, GROUP_UI);
-  }
-
-  virtual void TearDown() {
-    dir_maker_.TearDown();
+    AddUpdateHandler(AUTOFILL);
+    AddUpdateHandler(BOOKMARKS);
+    AddUpdateHandler(PREFERENCES);
   }
 
   ModelTypeSet request_types() {
     return request_types_;
   }
 
-  syncable::Directory* directory() {
-    return dir_maker_.directory();
-  }
-
   scoped_ptr<GetUpdatesProcessor> BuildGetUpdatesProcessor(
       const GetUpdatesDelegate& delegate) {
     return scoped_ptr<GetUpdatesProcessor>(
         new GetUpdatesProcessor(&update_handler_map_, delegate));
   }
 
   void InitFakeUpdateResponse(sync_pb::GetUpdatesResponse* response) {
     ModelTypeSet types = request_types();
 
     for (ModelTypeSet::Iterator it = types.First(); it.Good(); it.Inc()) {
       sync_pb::DataTypeProgressMarker* marker =
           response->add_new_progress_marker();
       marker->set_data_type_id(GetSpecificsFieldNumberFromModelType(it.Get()));
       marker->set_token("foobarbaz");
     }
 
     response->set_changes_remaining(0);
   }
 
   const base::TimeTicks kTestStartTime;
 
  private:
-  void AddUpdateHandler(ModelType type, ModelSafeGroup group) {
-    DCHECK(directory());
-
+  void AddUpdateHandler(ModelType type) {
     request_types_.Put(type);
 
-    scoped_refptr<ModelSafeWorker> worker = new FakeModelWorker(group);
-    SyncDirectoryUpdateHandler* handler =
-        new SyncDirectoryUpdateHandler(directory(), type, worker);
+    UpdateHandler* handler = new MockUpdateHandler(type);
     update_handler_map_.insert(std::make_pair(type, handler));
   }
 
-  base::MessageLoop loop_;  // Needed for directory init.
-  TestDirectorySetterUpper dir_maker_;
-
   ModelTypeSet request_types_;
   UpdateHandlerMap update_handler_map_;
   STLValueDeleter<UpdateHandlerMap> update_handler_deleter_;
   scoped_ptr<GetUpdatesProcessor> get_updates_processor_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadUpdatesTest);
 };
 
 // Basic test to make sure nudges are expressed properly in the request.
 TEST_F(DownloadUpdatesTest, BookmarkNudge) {
@@ skipping 265 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