[Sync] Enable adding notifier observers from ProfileSyncService

chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc

Index: chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
diff --git a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
index acf0898f554ec057eaeadb9fbfa0cb05e2c1d00b..991b774d4be1ddb190c653a23d41f8447512d762 100644
--- a/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
+++ b/chrome/browser/sync/glue/chrome_sync_notification_bridge_unittest.cc
@@ -5,8 +5,8 @@
 #include "chrome/browser/sync/glue/chrome_sync_notification_bridge.h"
 
 #include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/memory/ref_counted.h"
+#include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop.h"
 #include "base/sequenced_task_runner.h"
@@ -53,12 +53,8 @@ class FakeSyncNotifierObserver : public syncer::SyncNotifierObserver {
         expected_payloads_(expected_payloads),
         expected_source_(expected_source) {
     DCHECK(sync_task_runner_->RunsTasksOnCurrentThread());
-    // TODO(dcheng): We might want a function to go from ObjectIdPayloadMap ->
-    // ObjectIdSet to avoid this rather long incantation...
-    const syncer::ObjectIdSet& ids = syncer::ModelTypeSetToObjectIdSet(
-        syncer::ModelTypePayloadMapToEnumSet(
-            syncer::ObjectIdPayloadMapToModelTypePayloadMap(
-                expected_payloads)));
+    const syncer::ObjectIdSet& ids =
+        syncer::ObjectIdPayloadMapToSet(expected_payloads);
     bridge_->UpdateRegisteredIds(this, ids);
   }