Revert 72685 - [SYNC] Refactor SyncSourceInfo and add support in chrome inval...

chrome/browser/sync/notifier/chrome_invalidation_client.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/chrome_invalidation_client.h"
 
 #include <string>
 #include <vector>
 
 #include "base/compiler_specific.h"
@@ skipping 108 matching lines @@
 }
 
 void ChromeInvalidationClient::Invalidate(
     const invalidation::Invalidation& invalidation,
     invalidation::Closure* callback) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   DCHECK(invalidation::IsCallbackRepeatable(callback));
   VLOG(1) << "Invalidate: " << InvalidationToString(invalidation);
   syncable::ModelType model_type;
   if (ObjectIdToRealModelType(invalidation.object_id(), &model_type)) {
-    std::string payload;
-    // payload() CHECK()'s has_payload(), so we must check it ourselves first.
-    if (invalidation.has_payload())
-      payload = invalidation.payload();
-
     // 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.
     if (model_type == syncable::UNSPECIFIED) {
       listener_->OnInvalidateAll();
     } else {
-      listener_->OnInvalidate(model_type, payload);
+      listener_->OnInvalidate(model_type);
     }
   } else {
     LOG(WARNING) << "Could not get invalidation model type; "
                  << "invalidating everything";
     listener_->OnInvalidateAll();
   }
   RunAndDeleteClosure(callback);
 }
 
 void ChromeInvalidationClient::InvalidateAll(
@@ skipping 63 matching lines @@
 
 void ChromeInvalidationClient::HandleOutboundPacket(
     invalidation::NetworkEndpoint* const& network_endpoint) {
   DCHECK(non_thread_safe_.CalledOnValidThread());
   CHECK(cache_invalidation_packet_handler_.get());
   cache_invalidation_packet_handler_->
       HandleOutboundPacket(network_endpoint);
 }
 
 }  // namespace sync_notifier