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

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)) {
-    listener_->OnInvalidate(model_type);
+    if (invalidation.has_payload()) {

[akalin, 2011/01/12 09:55:19]

No need for the has_payload() check, assuming the default value for that
protobuf field is the empty string.  If so, you can simply do:

listener_->OnInvalidate(model_type, invalidation.payload());

[Nicolas Zea, 2011/01/13 19:17:30]

The has_payload is method isn't a protobuf defined one, but from
invalidation-types.h. payload() has a CHECK() to ensure the payload exists.

On 2011/01/12 09:55:19, akalin wrote:

[akalin, 2011/01/13 19:47:41]

Ah, I forgot about that.  How about:

std::string payload;
// payload() CHECKs has_payload() so we need to check for it ourselves.
if (...has_payload()) {
  payload = invalidation.payload();
}
listener_->OnInvalidate(..., payload);

[Nicolas Zea, 2011/01/18 06:07:23]

Done.

+      listener_->OnInvalidate(model_type, invalidation.payload());
+    } else {
+      listener_->OnInvalidate(model_type, std::string(""));
+    }
   } else {
     LOG(WARNING) << "Could not get invalidation model type; "
                  << "invalidating everything";
     listener_->OnInvalidateAll();
   }
   RunAndDeleteClosure(callback);
 }
 
 void ChromeInvalidationClient::InvalidateAll(
     invalidation::Closure* callback) {
@@ skipping 62 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