Turn app notifications sync to be on by default

BUG=96713
TEST=none


Review URL: http://codereview.chromium.org/8585006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110623 0039d316-1c4b-4281-b951-d872f2087c98

chrome/app/generated_resources.grd

@@ -4767,11 +4767,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_SYNC_TABS_DESCRIPTION" desc="Description for the flag to enable syncing the open tabs datatype">
         Enable open tabs in the sync options. This allows syncing your open tabs to other clients.
       </message>
-      <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME" desc="Title for the flag to enable syncing the app notifications datatype">
-        Enable syncing app notifications
+      <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME" desc="Title for the flag to disable syncing the app notifications datatype">
+        Disable syncing app notifications
       </message>
-      <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION" desc="Description for the flag to enable syncing the app notifications datatype">
-        Enable app notifications in the sync options. This allows syncing notifications received from your apps to other clients.
+      <message name="IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION" desc="Description for the flag to disable syncing the app notifications datatype">
+        Disable app notifications in the sync options. This turns off syncing notifications received from your apps to other clients.
       </message>
       <if expr="pp_ifdef('android')">
         <message name="IDS_FLAGS_SYNC_TYPED_URLS_NAME" desc="Title for the flag to enable syncing the TypedUrl datatype">

chrome/browser/about_flags.cc

@@ -294,7 +294,7 @@ const Experiment kExperiments[] = {
     IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME,
     IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION,
     kOsAll,
-    SINGLE_VALUE_TYPE(switches::kEnableSyncAppNotifications)
+    SINGLE_VALUE_TYPE(switches::kDisableSyncAppNotifications)
   },
   {
     "enable-smooth-scrolling",  // FLAGS:RECORD_UMA

chrome/browser/sync/profile_sync_factory_impl.cc

@@ -183,9 +183,9 @@ void ProfileSyncFactoryImpl::RegisterDataTypes(ProfileSyncService* pss) {
         new AutofillProfileDataTypeController(this, profile_));
   }
 
-  // App notifications sync is disabled by default.  Register only if
-  // explicitly enabled.
-  if (command_line_->HasSwitch(switches::kEnableSyncAppNotifications)) {
+  // App notifications sync is enabled by default.  Register only if
+  // explicitly disabled.
+  if (!command_line_->HasSwitch(switches::kDisableSyncAppNotifications)) {
     pss->RegisterDataTypeController(
         new AppNotificationDataTypeController(this, profile_, pss));
   }

chrome/browser/sync/profile_sync_factory_impl_unittest.cc

@@ -41,6 +41,7 @@ class ProfileSyncFactoryImplTest : public testing::Test {
     datatypes.push_back(syncable::THEMES);
     datatypes.push_back(syncable::EXTENSIONS);
     datatypes.push_back(syncable::APPS);
+    datatypes.push_back(syncable::APP_NOTIFICATIONS);
     datatypes.push_back(syncable::AUTOFILL_PROFILE);
     datatypes.push_back(syncable::PASSWORDS);
     datatypes.push_back(syncable::TYPED_URLS);

chrome/common/chrome_switches.cc

@@ -315,6 +315,9 @@ const char kDisableSync[]                   = "disable-sync";
 // Disables syncing of apps.
 const char kDisableSyncApps[]               = "disable-sync-apps";
 
+// Disable syncing app notifications.
+const char kDisableSyncAppNotifications[]    = "disable-sync-app-notifications";
+
 // Disables syncing of autofill.
 const char kDisableSyncAutofill[]           = "disable-sync-autofill";
 
@@ -556,9 +559,6 @@ const char kEnableSyncTabs[]                = "enable-sync-tabs";
 const char kEnableSyncTabsForOtherClients[] =
     "enable-sync-tabs-for-other-clients";
 
-// Enable syncing app notifications.
-const char kEnableSyncAppNotifications[]    = "enable-sync-app-notifications";
-
 // Enables context menu for selecting groups of tabs.
 const char kEnableTabGroupsContextMenu[]    = "enable-tab-groups-context-menu";
 

chrome/common/chrome_switches.h

@@ -95,6 +95,7 @@ extern const char kDisableSiteSpecificQuirks[];
 extern const char kDisableSSL3[];
 extern const char kDisableSync[];
 extern const char kDisableSyncApps[];
+extern const char kDisableSyncAppNotifications[];
 extern const char kDisableSyncAutofill[];
 extern const char kDisableSyncAutofillProfile[];
 extern const char kDisableSyncBookmarks[];
@@ -160,7 +161,6 @@ extern const char kEnableSyncExtensionSettings[];
 extern const char kEnableSyncOAuth[];
 extern const char kEnableSyncTabs[];
 extern const char kEnableSyncTabsForOtherClients[];
-extern const char kEnableSyncAppNotifications[];
 extern const char kEnableSyncedBookmarksFolder[];
 extern const char kEnableTabGroupsContextMenu[];
 extern const char kEnableTopSites[];