[Sync] Convert syncable/ directory to ModelEnumSet

chrome/browser/sync/notifier/p2p_notifier.cc

 // Copyright (c) 2011 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/p2p_notifier.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/message_loop_proxy.h"
@@ skipping 47 matching lines @@
   }
   LOG(WARNING) << "Could not parse " << target_str;
   return NOTIFY_SELF;
 }
 
 P2PNotificationData::P2PNotificationData() : target_(NOTIFY_SELF) {}
 
 P2PNotificationData::P2PNotificationData(
     const std::string& sender_id,
     P2PNotificationTarget target,
-    const syncable::ModelTypeSet& changed_types)
+    syncable::ModelEnumSet changed_types)
     : sender_id_(sender_id),
       target_(target),
       changed_types_(changed_types) {}
 
 P2PNotificationData::~P2PNotificationData() {}
 
 bool P2PNotificationData::IsTargeted(const std::string& id) const {
   switch (target_) {
     case NOTIFY_SELF:
       return sender_id_ == id;
     case NOTIFY_OTHERS:
       return sender_id_ != id;
     case NOTIFY_ALL:
       return true;
     default:
       NOTREACHED();
       return false;
   }
 }
 
-const syncable::ModelTypeSet& P2PNotificationData::GetChangedTypes() const {
+syncable::ModelEnumSet P2PNotificationData::GetChangedTypes() const {
   return changed_types_;
 }
 
 bool P2PNotificationData::Equals(const P2PNotificationData& other) const {
   return
       (sender_id_ == other.sender_id_) &&
       (target_ == other.target_) &&
-      (changed_types_ == other.changed_types_);
+      changed_types_.Equals(other.changed_types_);
 }
 
 std::string P2PNotificationData::ToString() const {
   scoped_ptr<DictionaryValue> dict(new DictionaryValue());
   dict->SetString(kSenderIdKey, sender_id_);
   dict->SetString(kNotificationTypeKey,
                   P2PNotificationTargetToString(target_));
-  dict->Set(kChangedTypesKey, syncable::ModelTypeSetToValue(changed_types_));
+  dict->Set(kChangedTypesKey, syncable::ModelEnumSetToValue(changed_types_));
   std::string json;
   base::JSONWriter::Write(dict.get(), false /* pretty_print */, &json);
   return json;
 }
 
 bool P2PNotificationData::ResetFromString(const std::string& str) {
   scoped_ptr<Value> data_value(
       base::JSONReader::Read(str, false /* allow_trailing_comma */));
   if (!data_value.get()) {
     LOG(WARNING) << "Could not parse " << str;
@@ skipping 15 matching lines @@
     LOG(WARNING) << "Could not find string value for "
                  << kNotificationTypeKey;
   }
   target_ = P2PNotificationTargetFromString(target_str);
   ListValue* changed_types_list = NULL;
   if (!data_dict->GetList(kChangedTypesKey, &changed_types_list)) {
     LOG(WARNING) << "Could not find list value for "
                  << kChangedTypesKey;
     return false;
   }
-  changed_types_ = syncable::ModelTypeSetFromValue(*changed_types_list);
+  changed_types_ = syncable::ModelEnumSetFromValue(*changed_types_list);
   return true;
 }
 
 P2PNotifier::P2PNotifier(notifier::TalkMediator* talk_mediator,
                          P2PNotificationTarget send_notification_target)
     : talk_mediator_(talk_mediator),
       logged_in_(false),
       notifications_enabled_(false),
       send_notification_target_(send_notification_target),
       parent_message_loop_proxy_(
@@ skipping 53 matching lines @@
     // from field, but it doesn't matter too much since this is only
     // used in p2p mode (which is only used in testing).
     subscription.from = email;
     talk_mediator_->AddSubscription(subscription);
 
     logged_in_ = true;
   }
 }
 
 void P2PNotifier::UpdateEnabledTypes(
-    const syncable::ModelTypeSet& enabled_types) {
+    syncable::ModelEnumSet enabled_types) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
-  syncable::ModelTypeSet new_enabled_types;
-  std::set_difference(enabled_types.begin(), enabled_types.end(),
-                      enabled_types_.begin(), enabled_types_.end(),
-                      std::inserter(new_enabled_types,
-                                    new_enabled_types.end()));
+  const syncable::ModelEnumSet new_enabled_types =
+      Difference(enabled_types, enabled_types_);
   enabled_types_ = enabled_types;
   const P2PNotificationData notification_data(
       unique_id_, NOTIFY_SELF, new_enabled_types);
   SendNotificationData(notification_data);
 }
 
 void P2PNotifier::SendNotification(
-    const syncable::ModelTypeSet& changed_types) {
+    syncable::ModelEnumSet changed_types) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   const P2PNotificationData notification_data(
       unique_id_, send_notification_target_, changed_types);
   SendNotificationData(notification_data);
 }
 
 void P2PNotifier::OnNotificationStateChange(bool notifications_enabled) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   bool disabled_to_enabled = notifications_enabled && !notifications_enabled_;
   notifications_enabled_ = notifications_enabled;
@@ skipping 27 matching lines @@
     LOG(WARNING) << "Could not parse notification data from "
                  << notification.data;
     notification_data =
         P2PNotificationData(unique_id_, NOTIFY_ALL, enabled_types_);
   }
   if (!notification_data.IsTargeted(unique_id_)) {
     DVLOG(1) << "Not a target of the notification -- "
              << "not emitting notification";
     return;
   }
-  if (notification_data.GetChangedTypes().empty()) {
+  if (notification_data.GetChangedTypes().Empty()) {
     DVLOG(1) << "No changed types -- not emitting notification";
     return;
   }
   const syncable::ModelTypePayloadMap& type_payloads =
-      syncable::ModelTypePayloadMapFromBitSet(
-          syncable::ModelTypeBitSetFromSet(
-              notification_data.GetChangedTypes()), std::string());
+      syncable::ModelTypePayloadMapFromEnumSet(
+          notification_data.GetChangedTypes(), std::string());
   FOR_EACH_OBSERVER(SyncNotifierObserver, observer_list_,
                     OnIncomingNotification(type_payloads));
 }
 
 void P2PNotifier::OnOutgoingNotification() {}
 
 void P2PNotifier::SendNotificationDataForTest(
     const P2PNotificationData& notification_data) {
   SendNotificationData(notification_data);
 }
 
 void P2PNotifier::SendNotificationData(
     const P2PNotificationData& notification_data) {
   DCHECK(parent_message_loop_proxy_->BelongsToCurrentThread());
   notifier::Notification notification;
   notification.channel = kSyncP2PNotificationChannel;
   notification.data = notification_data.ToString();
   DVLOG(1) << "Sending XMPP notification: " << notification.ToString();
   talk_mediator_->SendNotification(notification);
 }
 
 }  // namespace sync_notifier