[SYNC] Refactor SyncSourceInfo and add support in chrome invalidation client ...

chrome/browser/sync/engine/download_updates_command.cc

 // Copyright (c) 2006-2009 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 "chrome/browser/sync/engine/download_updates_command.h"
 
 #include <string>
 
 #include "chrome/browser/sync/engine/syncer.h"
 #include "chrome/browser/sync/engine/syncer_proto_util.h"
@@ skipping 42 matching lines @@
 
   VLOG(1) << "Getting updates for types " << enabled_types.to_string();
   DCHECK(enabled_types.any());
 
   // We want folders for our associated types, always.  If we were to set
   // this to false, the server would send just the non-container items
   // (e.g. Bookmark URLs but not their containing folders).
   get_updates->set_fetch_folders(true);
 
   // Set GetUpdatesMessage.GetUpdatesCallerInfo information.
+  // TODO(zea): send SyncSourceInfo's payloads to server once we know it's all
+  // working properly.
   get_updates->mutable_caller_info()->set_source(
-      session->TestAndSetSource().first);
+      session->TestAndSetSource().updates_source);
   get_updates->mutable_caller_info()->set_notifications_enabled(
       session->context()->notifications_enabled());
 
   SyncerProtoUtil::AddRequestBirthday(dir, &client_to_server_message);
 
   bool ok = SyncerProtoUtil::PostClientToServerMessage(
       client_to_server_message,
       &update_response,
       session);
 
@@ skipping 29 matching lines @@
     if (target_datatypes[i]) {
       requested_type_count++;
       syncable::AddDefaultExtensionValue(syncable::ModelTypeFromInt(i),
                                          filter_protobuf);
     }
   }
   DCHECK_LT(0, requested_type_count) << "Doing GetUpdates with empty filter.";
 }
 
 }  // namespace browser_sync