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

chrome/browser/sync/engine/syncapi.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/engine/syncapi.h"
 
 #include <bitset>
 #include <iomanip>
 #include <list>
+#include <map>
 #include <string>
 #include <vector>
 
 #include "base/base64.h"
 #include "base/lock.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/scoped_ptr.h"
 #include "base/sha1.h"
 #include "base/string_util.h"
@@ skipping 56 matching lines @@
 using syncable::Directory;
 using syncable::DirectoryManager;
 using syncable::Entry;
 using syncable::SPECIFICS;
 using sync_pb::AutofillProfileSpecifics;
 
 typedef GoogleServiceAuthError AuthError;
 
 static const int kThreadExitTimeoutMsec = 60000;
 static const int kSSLPort = 443;
+const int kSyncerThreadDelayMsec = 250;
 
 #if defined(OS_CHROMEOS)
 static const int kChromeOSNetworkChangeReactionDelayHackMsec = 5000;
 #endif  // OS_CHROMEOS
 
 // We manage the lifetime of sync_api::SyncManager::SyncInternal ourselves.
 DISABLE_RUNNABLE_METHOD_REFCOUNT(sync_api::SyncManager::SyncInternal);
 
 namespace sync_api {
 
@@ skipping 2091 matching lines @@
   DCHECK(!email.empty());
   DCHECK(!token.empty());
   InitializeTalkMediator();
   talk_mediator_->SetAuthToken(email, token, SYNC_SERVICE_NAME);
   talk_mediator_->Login();
 }
 
 void SyncManager::SyncInternal::OnIncomingNotification(
     const IncomingNotificationData& notification_data) {
   syncable::ModelTypeBitSet model_types;
+  std::map<syncable::ModelType, std::string> payloads;
 
   // Check if the service url is a sync URL.  An empty service URL is
   // treated as a legacy sync notification.  If we're listening to
   // server-issued notifications, no need to check the service_url.
   if (notifier_options_.notification_method ==
       notifier::NOTIFICATION_SERVER) {
-    VLOG(1) << "Sync received server notification: " <<
+    VLOG(1) << "Sync received server notification from " <<
+        notification_data.service_url << ": " <<
         notification_data.service_specific_data;
 
     if (!syncable::ModelTypeBitSetFromString(
-            notification_data.service_specific_data,
+            notification_data.service_url,
             &model_types)) {
       LOG(DFATAL) << "Could not extract model types from server data.";
       model_types.set();
     }
+    if (!notification_data.service_specific_data.empty()) {

[akalin, 2011/01/19 22:14:52]

no need for the empty check -- we can just always set the keys of payloads.

[Nicolas Zea, 2011/01/19 22:54:56]

Done.

+      for (size_t i = syncable::FIRST_REAL_MODEL_TYPE;
+           i < model_types.size();
+           ++i) {
+        if (model_types[i]) {
+          payloads[syncable::ModelTypeFromInt(i)] =
+              notification_data.service_specific_data;
+        }
+      }
+    }
   } else if (notification_data.service_url.empty() ||
              (notification_data.service_url ==
               browser_sync::kSyncLegacyServiceUrl) ||
              (notification_data.service_url ==
               browser_sync::kSyncServiceUrl)) {
     VLOG(1) << "Sync received P2P notification.";
 
     // Catch for sync integration tests (uses p2p). Just set all datatypes.
     model_types.set();
   } else {
     LOG(WARNING) << "Notification fron unexpected source: "
                  << notification_data.service_url;
   }
 
   if (model_types.any()) {
     if (syncer_thread()) {
-     // Introduce a delay to help coalesce initial notifications.
-     syncer_thread()->NudgeSyncerWithDataTypes(
-         250,
-         SyncerThread::kNotification,
-         model_types);
+      // If this notification had a payload, pass it along, else just pass the

[akalin, 2011/01/19 22:14:52]

Per the above, no need for this check either -- just call
NudgeSyncerWithPayloads.

[Nicolas Zea, 2011/01/19 22:54:56]

Done.

+      // datatypes that triggered the notification.
+      if (notification_data.service_specific_data.empty()) {
+        syncer_thread()->NudgeSyncerWithDataTypes(
+            kSyncerThreadDelayMsec,
+            SyncerThread::kNotification,
+            model_types);
+      } else {
+        syncer_thread()->NudgeSyncerWithPayloads(
+            kSyncerThreadDelayMsec,
+            SyncerThread::kNotification,
+            payloads);
+      }
     }
     allstatus_.IncrementNotificationsReceived();
   } else {
     LOG(WARNING) << "Sync received notification without any type information.";
   }
 }
 
 void SyncManager::SyncInternal::OnOutgoingNotification() {
   DCHECK_NE(notifier_options_.notification_method,
             notifier::NOTIFICATION_SERVER);
@@ skipping 59 matching lines @@
   DCHECK(data_->initialized()) << "GetUserShare requires initialization!";
   return data_->GetUserShare();
 }
 
 bool SyncManager::HasUnsyncedItems() const {
   sync_api::ReadTransaction trans(GetUserShare());
   return (trans.GetWrappedTrans()->directory()->unsynced_entity_count() != 0);
 }
 
 }  // namespace sync_api