Separate local and remote sync invalidations

sync/internal_api/sync_manager_impl.cc

 // Copyright (c) 2012 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 "sync/internal_api/sync_manager_impl.h"
 
 #include <string>
 
 #include "base/base64.h"
 #include "base/bind.h"
@@ skipping 1229 matching lines @@
                            JsEventDetails(&details));
   }
 }
 
 void SyncManagerImpl::OnIncomingInvalidation(
     const ObjectIdInvalidationMap& invalidation_map,
     IncomingInvalidationSource source) {
   DCHECK(thread_checker_.CalledOnValidThread());
   const ModelTypeInvalidationMap& type_invalidation_map =
       ObjectIdInvalidationMapToModelTypeInvalidationMap(invalidation_map);
-  if (source == LOCAL_INVALIDATION) {
-    allstatus_.IncrementNudgeCounter(NUDGE_SOURCE_LOCAL_REFRESH);
-    scheduler_->ScheduleNudgeWithStatesAsync(
-        TimeDelta::FromMilliseconds(kSyncRefreshDelayMsec),
-        NUDGE_SOURCE_LOCAL_REFRESH,
-        type_invalidation_map, FROM_HERE);
-  } else if (!type_invalidation_map.empty()) {
+  if (type_invalidation_map.empty()) {
+    LOG(WARNING) << "Sync received invalidation without any type information.";
+  } else {
     allstatus_.IncrementNudgeCounter(NUDGE_SOURCE_NOTIFICATION);
     scheduler_->ScheduleNudgeWithStatesAsync(
         TimeDelta::FromMilliseconds(kSyncSchedulerDelayMsec),
         NUDGE_SOURCE_NOTIFICATION,
         type_invalidation_map, FROM_HERE);
     allstatus_.IncrementNotificationsReceived();
     UpdateNotificationInfo(type_invalidation_map);
     debug_info_event_listener_.OnIncomingNotification(type_invalidation_map);
-  } else {
-    LOG(WARNING) << "Sync received invalidation without any type information.";
   }
 
   if (js_event_handler_.IsInitialized()) {
     DictionaryValue details;
     ListValue* changed_types = new ListValue();
     details.Set("changedTypes", changed_types);
     for (ModelTypeInvalidationMap::const_iterator it =
              type_invalidation_map.begin(); it != type_invalidation_map.end();
          ++it) {
       const std::string& model_type_str =
           ModelTypeToString(it->first);
       changed_types->Append(Value::CreateStringValue(model_type_str));
     }
-    details.SetString("source", (source == LOCAL_INVALIDATION) ?
-        "LOCAL_INVALIDATION" : "REMOTE_INVALIDATION");
+    details.SetString("source", "REMOTE_INVALIDATION");
     js_event_handler_.Call(FROM_HERE,
                            &JsEventHandler::HandleJsEvent,
                            "onIncomingNotification",
+                           JsEventDetails(&details));
+  }
+}
+
+void SyncManagerImpl::RefreshTypes(ModelTypeSet types) {
+  DCHECK(thread_checker_.CalledOnValidThread());
+  const ModelTypeInvalidationMap& type_invalidation_map =
+      ModelTypeSetToInvalidationMap(types, "");

[Nicolas Zea, 2013/01/28 23:48:43]

handle the empty type invalidation map case here too?

[rlarocque, 2013/01/29 18:48:58]

Fixed.  I'm not sure that it's necessary, but it can't hurt to maintain the
current behaviour.

+  allstatus_.IncrementNudgeCounter(NUDGE_SOURCE_LOCAL_REFRESH);
+  scheduler_->ScheduleNudgeWithStatesAsync(
+      TimeDelta::FromMilliseconds(kSyncRefreshDelayMsec),
+      NUDGE_SOURCE_LOCAL_REFRESH,
+      type_invalidation_map, FROM_HERE);
+
+  if (js_event_handler_.IsInitialized()) {
+    DictionaryValue details;
+    ListValue* changed_types = new ListValue();
+    details.Set("changedTypes", changed_types);
+    for (ModelTypeInvalidationMap::const_iterator it =
+             type_invalidation_map.begin(); it != type_invalidation_map.end();
+         ++it) {
+      const std::string& model_type_str =
+          ModelTypeToString(it->first);
+      changed_types->Append(Value::CreateStringValue(model_type_str));
+    }
+    details.SetString("source", "LOCAL_INVALIDATION");
+    js_event_handler_.Call(FROM_HERE,
+                           &JsEventHandler::HandleJsEvent,
+                           "onIncomingNotification",
                            JsEventDetails(&details));
   }
 }
 
 SyncStatus SyncManagerImpl::GetDetailedStatus() const {
   return allstatus_.status();
 }
 
 void SyncManagerImpl::SaveChanges() {
   directory()->SaveChanges();
@@ skipping 61 matching lines @@
 int SyncManagerImpl::GetDefaultNudgeDelay() {
   return kDefaultNudgeDelayMilliseconds;
 }
 
 // static.
 int SyncManagerImpl::GetPreferencesNudgeDelay() {
   return kPreferencesNudgeDelayMilliseconds;
 }
 
 }  // namespace syncer