sync: Inject sync/'s dependency on invalidations

sync/engine/get_updates_processor_unittest.cc

 // Copyright 2014 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/get_updates_processor.h"
 
 #include "base/message_loop/message_loop.h"
 #include "base/stl_util.h"
 #include "sync/engine/get_updates_delegate.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/test/engine/fake_model_worker.h"
 #include "sync/test/engine/mock_update_handler.h"
+#include "sync/test/mock_invalidation.h"
 #include "sync/test/sessions/mock_debug_info_getter.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace syncer {
 
+namespace {
+
+scoped_ptr<InvalidationInterface> BuildInvalidation(
+    int64 version,
+    const std::string& payload) {
+  return MockInvalidation::Build(version, payload)
+      .PassAs<InvalidationInterface>();
+}
+
+}  // namespace
+
 using sessions::MockDebugInfoGetter;
 
 // A test fixture for tests exercising download updates functions.
 class GetUpdatesProcessorTest : public ::testing::Test {
  protected:
   GetUpdatesProcessorTest() :
     kTestStartTime(base::TimeTicks::Now()),
     update_handler_deleter_(&update_handler_map_) {}
 
   virtual void SetUp() {
@@ skipping 93 matching lines @@
       EXPECT_EQ(0, gu_trigger.local_modification_nudges());
       EXPECT_EQ(0, gu_trigger.datatype_refresh_nudges());
     }
   }
 }
 
 // Basic test to ensure invalidation payloads are expressed in the request.
 TEST_F(GetUpdatesProcessorTest, NotifyMany) {
   sessions::NudgeTracker nudge_tracker;
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(AUTOFILL, 1, "autofill_payload"));
+      AUTOFILL, BuildInvalidation(1, "autofill_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(BOOKMARKS, 1, "bookmark_payload"));
+      BOOKMARKS, BuildInvalidation(1, "bookmark_payload"));
   nudge_tracker.RecordRemoteInvalidation(
-      BuildInvalidationMap(PREFERENCES, 1, "preferences_payload"));
+      PREFERENCES, BuildInvalidation(1, "preferences_payload"));
   ModelTypeSet notified_types;
   notified_types.Put(AUTOFILL);
   notified_types.Put(BOOKMARKS);
   notified_types.Put(PREFERENCES);
 
   sync_pb::ClientToServerMessage message;
   NormalGetUpdatesDelegate normal_delegate(nudge_tracker);
   scoped_ptr<GetUpdatesProcessor> processor(
       BuildGetUpdatesProcessor(normal_delegate));
   processor->PrepareGetUpdates(enabled_types(), &message);
@@ skipping 304 matching lines @@
 TEST_F(DownloadUpdatesDebugInfoTest, VerifyCopyOverwrites) {
   sync_pb::DebugInfo debug_info;
   AddDebugEvent();
   GetUpdatesProcessor::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
   GetUpdatesProcessor::CopyClientDebugInfo(debug_info_getter(), &debug_info);
   EXPECT_EQ(1, debug_info.events_size());
 }
 
 }  // namespace syncer