Revert 190089 "Turn on SyncedNotifications for Dev, Canary, and ..."

trunk/src/chrome/browser/sync/profile_sync_components_factory_impl.cc

Index: trunk/src/chrome/browser/sync/profile_sync_components_factory_impl.cc
===================================================================
--- trunk/src/chrome/browser/sync/profile_sync_components_factory_impl.cc	(revision 190470)
+++ trunk/src/chrome/browser/sync/profile_sync_components_factory_impl.cc	(working copy)
@@ -59,7 +59,6 @@
 #include "chrome/browser/webdata/autocomplete_syncable_service.h"
 #include "chrome/browser/webdata/autofill_profile_syncable_service.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/common/chrome_version_info.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/browser_thread.h"
 #include "sync/api/syncable_service.h"
@@ -241,15 +240,12 @@
 
   // Synced Notifications sync is disabled by default.
   // TODO(petewil): Switch to enabled by default once datatype support is done.
-  chrome::VersionInfo::Channel channel = chrome::VersionInfo::GetChannel();
-  if (!command_line_->HasSwitch(switches::kDisableSyncSyncedNotifications)) {
-    if (channel == chrome::VersionInfo::CHANNEL_UNKNOWN ||
-        channel == chrome::VersionInfo::CHANNEL_CANARY ||
-        channel == chrome::VersionInfo::CHANNEL_DEV) {
-      pss->RegisterDataTypeController(
-          new UIDataTypeController(
-              syncer::SYNCED_NOTIFICATIONS, this, profile_, pss));
-    }
+  if (command_line_->HasSwitch(switches::kEnableSyncSyncedNotifications)) {
+#if !defined(OS_ANDROID)
+    pss->RegisterDataTypeController(
+        new UIDataTypeController(
+            syncer::SYNCED_NOTIFICATIONS, this, profile_, pss));
+#endif
   }
 
 #if defined(OS_LINUX) || defined(OS_WIN) || defined(OS_CHROMEOS)