sync: Remove SyncSourceInfo

sync/engine/syncer_unittest.cc

 // Copyright 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.
 //
 // Syncer unit tests. Unfortunately a lot of these tests
 // are outdated and need to be reworked and updated.
 
 #include <algorithm>
 #include <limits>
 #include <list>
@@ skipping 163 matching lines @@
       case SyncEngineEvent::STATUS_CHANGED:
       case SyncEngineEvent::SYNC_CYCLE_ENDED:
         return;
       default:
         CHECK(false) << "Handling unknown error type in unit tests!!";
     }
     saw_syncer_event_ = true;
   }
 
   void SyncShareNudge() {
-    ModelSafeRoutingInfo info;
-    GetModelSafeRoutingInfo(&info);
-    ModelTypeInvalidationMap invalidation_map =
-        ModelSafeRoutingInfoToInvalidationMap(info, std::string());
-    sessions::SyncSourceInfo source_info(
-        sync_pb::GetUpdatesCallerInfo::LOCAL,
-        invalidation_map);
-    session_.reset(SyncSession::Build(context_.get(), this, source_info));
+    session_.reset(SyncSession::Build(context_.get(), this));
 
     // Pretend we've seen a local change, to make the nudge_tracker look normal.
     nudge_tracker_.RecordLocalChange(ModelTypeSet(BOOKMARKS));
 
     EXPECT_TRUE(
         syncer_->NormalSyncShare(
             GetRoutingInfoTypes(context_->routing_info()),
             nudge_tracker_,
             session_.get()));
   }
 
   void SyncShareConfigure() {
-    ModelSafeRoutingInfo info;
-    GetModelSafeRoutingInfo(&info);
-    ModelTypeInvalidationMap invalidation_map =
-        ModelSafeRoutingInfoToInvalidationMap(info, std::string());
-    sessions::SyncSourceInfo source_info(
-        sync_pb::GetUpdatesCallerInfo::RECONFIGURATION,
-        invalidation_map);
-    session_.reset(SyncSession::Build(context_.get(),
-                                      this,
-                                      source_info));
+    session_.reset(SyncSession::Build(context_.get(), this));
     EXPECT_TRUE(syncer_->ConfigureSyncShare(
             GetRoutingInfoTypes(context_->routing_info()),
+            sync_pb::GetUpdatesCallerInfo::RECONFIGURATION,
             session_.get()));
   }
 
   virtual void SetUp() {
     dir_maker_.SetUp();
     mock_server_.reset(new MockConnectionManager(directory()));
     EnableDatatype(BOOKMARKS);
     EnableDatatype(NIGORI);
     EnableDatatype(PREFERENCES);
     EnableDatatype(NIGORI);
@@ skipping 4593 matching lines @@
     EXPECT_EQ("xyz", final_monitor_records["xyz"].extension_id);
     EXPECT_EQ(2049U, final_monitor_records["ABC"].bookmark_write_count);
     EXPECT_EQ(4U,    final_monitor_records["xyz"].bookmark_write_count);
   } else {
     EXPECT_TRUE(final_monitor_records.empty())
         << "Should not restore records after successful bookmark commit.";
   }
 }
 
 }  // namespace syncer