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

chrome/browser/sync/notifier/server_notifier_thread.cc

 // Copyright (c) 2010 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/notifier/server_notifier_thread.h"
 
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 46 matching lines @@
   MediatorThreadImpl::Logout();
 }
 
 void ServerNotifierThread::SendNotification(
     const OutgoingNotificationData& data) {
   DCHECK_EQ(MessageLoop::current(), parent_message_loop_);
   NOTREACHED() << "Shouldn't send notifications if ServerNotifierThread is "
                   "used";
 }
 
-void ServerNotifierThread::OnInvalidate(syncable::ModelType model_type) {
+void ServerNotifierThread::OnInvalidate(
+    syncable::ModelType model_type,
+    const std::string& payload) {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   // TODO(akalin): This is a hack to make new sync data types work
   // with server-issued notifications.  Remove this when it's not
   // needed anymore.
   VLOG(1) << "OnInvalidate: " << ((model_type == syncable::UNSPECIFIED) ?
       "UNKNOWN" : syncable::ModelTypeToString(model_type));
 
   syncable::ModelTypeBitSet model_types;
   model_types[model_type] = true;
   IncomingNotificationData notification_data;
-  notification_data.service_specific_data = model_types.to_string();
+  notification_data.service_url = model_types.to_string();
+  notification_data.service_specific_data = payload;
   observers_->Notify(&Observer::OnIncomingNotification, notification_data);
 }
 
 void ServerNotifierThread::OnInvalidateAll() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   VLOG(1) << "OnInvalidateAll";
 
   syncable::ModelTypeBitSet model_types;
   model_types.set();  // InvalidateAll, so set all datatypes to true.
   IncomingNotificationData notification_data;
@@ skipping 40 matching lines @@
   chrome_invalidation_client_->RegisterTypes();
   observers_->Notify(&Observer::OnSubscriptionStateChange, true);
 }
 
 void ServerNotifierThread::StopInvalidationListener() {
   DCHECK_EQ(MessageLoop::current(), worker_message_loop());
   chrome_invalidation_client_.reset();
 }
 
 }  // namespace sync_notifier