| Index: chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
|
| diff --git a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
|
| index 674c223d48824f76c21181da1c964f05a43e1217..48f07d25b9a29b12c46fd84a9191836a4b7c877f 100644
|
| --- a/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
|
| +++ b/chrome/browser/sync/notifier/non_blocking_invalidation_notifier.cc
|
| @@ -33,7 +33,7 @@ class NonBlockingInvalidationNotifier::Core
|
| void SetUniqueId(const std::string& unique_id);
|
| void SetState(const std::string& state);
|
| void UpdateCredentials(const std::string& email, const std::string& token);
|
| - void UpdateEnabledTypes(const syncable::ModelTypeSet& enabled_types);
|
| + void UpdateEnabledTypes(syncable::ModelEnumSet enabled_types);
|
|
|
| // SyncNotifierObserver implementation (all called on I/O thread).
|
| virtual void OnIncomingNotification(
|
| @@ -113,7 +113,7 @@ void NonBlockingInvalidationNotifier::Core::UpdateCredentials(
|
| }
|
|
|
| void NonBlockingInvalidationNotifier::Core::UpdateEnabledTypes(
|
| - const syncable::ModelTypeSet& enabled_types) {
|
| + syncable::ModelEnumSet enabled_types) {
|
| DCHECK(io_message_loop_proxy_->BelongsToCurrentThread());
|
| invalidation_notifier_->UpdateEnabledTypes(enabled_types);
|
| }
|
| @@ -223,7 +223,7 @@ void NonBlockingInvalidationNotifier::UpdateCredentials(
|
| }
|
|
|
| void NonBlockingInvalidationNotifier::UpdateEnabledTypes(
|
| - const syncable::ModelTypeSet& enabled_types) {
|
| + syncable::ModelEnumSet enabled_types) {
|
| DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
|
| if (!io_message_loop_proxy_->PostTask(
|
| FROM_HERE,
|
| @@ -234,7 +234,7 @@ void NonBlockingInvalidationNotifier::UpdateEnabledTypes(
|
| }
|
|
|
| void NonBlockingInvalidationNotifier::SendNotification(
|
| - const syncable::ModelTypeSet& changed_types) {
|
| + syncable::ModelEnumSet changed_types) {
|
| DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
|
| // InvalidationClient doesn't implement SendNotification(), so no
|
| // need to forward on the call.
|
|
|