sync: Remove SyncSourceInfo

sync/engine/download.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 <string>
 
 #include "base/command_line.h"
 #include "sync/engine/process_updates_command.h"
@@ skipping 196 matching lines @@
         type,
         progress_marker->mutable_get_update_triggers());
   }
 
   return ExecuteDownloadUpdates(session, &client_to_server_message);
 }
 
 SyncerError DownloadUpdatesForConfigure(
     SyncSession* session,
     bool create_mobile_bookmarks_folder,
-    const syncer::sessions::SyncSourceInfo& source,
+    sync_pb::GetUpdatesCallerInfo::GetUpdatesSource source,
     ModelTypeSet request_types) {
   sync_pb::ClientToServerMessage client_to_server_message;
   InitDownloadUpdatesRequest(
       session,
       create_mobile_bookmarks_folder,
       &client_to_server_message,
       request_types);
   sync_pb::GetUpdatesMessage* get_updates =
       client_to_server_message.mutable_get_updates();
 
   // Request updates for all enabled types.
   DVLOG(1) << "Initial download for types "
            << ModelTypeSetToString(request_types);
   DCHECK(!request_types.Empty());
 
   // Set legacy GetUpdatesMessage.GetUpdatesCallerInfo information.
-  get_updates->mutable_caller_info()->set_source(source.updates_source);
+  get_updates->mutable_caller_info()->set_source(source);
 
   // Set the new and improved version of source, too.
   sync_pb::SyncEnums::GetUpdatesOrigin origin =
-      ConvertConfigureSourceToOrigin(source.updates_source);
+      ConvertConfigureSourceToOrigin(source);
   get_updates->set_get_updates_origin(origin);
 
   return ExecuteDownloadUpdates(session, &client_to_server_message);
 }
 
 SyncerError DownloadUpdatesForPoll(
     SyncSession* session,
     bool create_mobile_bookmarks_folder,
     ModelTypeSet request_types) {
   sync_pb::ClientToServerMessage client_to_server_message;
   InitDownloadUpdatesRequest(
       session,
       create_mobile_bookmarks_folder,
       &client_to_server_message,
       request_types);
   sync_pb::GetUpdatesMessage* get_updates =
       client_to_server_message.mutable_get_updates();
 
   DVLOG(1) << "Polling for types "
            << ModelTypeSetToString(request_types);
   DCHECK(!request_types.Empty());
-  DCHECK_EQ(sync_pb::GetUpdatesCallerInfo::PERIODIC,
-            session->source().updates_source);
 
   // Set legacy GetUpdatesMessage.GetUpdatesCallerInfo information.
   get_updates->mutable_caller_info()->set_source(
       sync_pb::GetUpdatesCallerInfo::PERIODIC);
 
   // Set the new and improved version of source, too.
   get_updates->set_get_updates_origin(sync_pb::SyncEnums::PERIODIC);
 
   return ExecuteDownloadUpdates(session, &client_to_server_message);
 }
 
 void AppendClientDebugInfoIfNeeded(
     SyncSession* session,
     DebugInfo* debug_info) {
   // We want to send the debug info only once per sync cycle. Check if it has
   // already been sent.
   if (!session->status_controller().debug_info_sent()) {
     DVLOG(1) << "Sending client debug info ...";
     // could be null in some unit tests.
     if (session->context()->debug_info_getter()) {
       session->context()->debug_info_getter()->GetAndClearDebugInfo(
           debug_info);
     }
     session->mutable_status_controller()->set_debug_info_sent();
   }
 }
 
 }  // namespace syncer