Enable App List Sync by default (Take 2)

BUG=305024
For chrome/browser/sync

R=jennyz@chromium.org, tapted@chromium.org
TBR=zea@chromium.org

Original CL: https://codereview.chromium.org/187813006/

Review URL: https://codereview.chromium.org/195753003

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

9 files changed, 18 insertions, 26 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 51ab4f9..9c4e01a 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -6568,11 +6568,11 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_FLAGS_ENABLE_SYNCED_NOTIFICATIONS_DESCRIPTION" desc="Description for the flag to enable synced notifications.">
         Enable experimental Synchronized Notifications.
       </message>
-      <message name="IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME" desc="Name of the flag to enable syncing the app list.">
-        Enable App Launcher sync
+      <message name="IDS_FLAGS_DISABLE_SYNC_APP_LIST_NAME" desc="Name of the flag to disable syncing the app list.">
+        Disable App Launcher sync
       </message>
-      <message name="IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION" desc="Description for the flag to enable syncing the app list.">
-        Enable experimental App Launcher sync.
+      <message name="IDS_FLAGS_DISABLE_SYNC_APP_LIST_DESCRIPTION" desc="Description for the flag to disable syncing the app list.">
+        Disable App Launcher sync.
       </message>
       <message name="IDS_FLAGS_ENABLE_SCREEN_CAPTURE_NAME" desc="Name of the flag to enable screen capture support.">
         Enable screen capture support in getUserMedia().
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index 75c4332..b1f19f2 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -1284,11 +1284,11 @@ const Experiment kExperiments[] = {
   },
 #if defined(ENABLE_APP_LIST)
   {
-    "enable-sync-app-list",
-    IDS_FLAGS_ENABLE_SYNC_APP_LIST_NAME,
-    IDS_FLAGS_ENABLE_SYNC_APP_LIST_DESCRIPTION,
+    "disable-sync-app-list",
+    IDS_FLAGS_DISABLE_SYNC_APP_LIST_NAME,
+    IDS_FLAGS_DISABLE_SYNC_APP_LIST_DESCRIPTION,
     kOsDesktop,
-    SINGLE_VALUE_TYPE(switches::kEnableSyncAppList)
+    SINGLE_VALUE_TYPE(switches::kDisableSyncAppList)
   },
 #endif
   {
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc
index f8374d7..c10a6aa 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc
@@ -344,8 +344,7 @@ void ProfileSyncComponentsFactoryImpl::RegisterDesktopDataTypes(
   }
 
 #if defined(ENABLE_APP_LIST)
-  // App List sync is disabled by default.  Register only if enabled.
-  if (command_line_->HasSwitch(switches::kEnableSyncAppList)) {
+  if (!command_line_->HasSwitch(switches::kDisableSyncAppList)) {
     pss->RegisterDataTypeController(
         new UIDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
index d6f59ac..0ac99eb 100644
--- a/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
+++ b/chrome/browser/sync/profile_sync_components_factory_impl_unittest.cc
@@ -37,6 +37,9 @@ class ProfileSyncComponentsFactoryImplTest : public testing::Test {
   static std::vector<syncer::ModelType> DefaultDatatypes() {
     std::vector<syncer::ModelType> datatypes;
     datatypes.push_back(syncer::APPS);
+#if defined(ENABLE_APP_LIST)
+    datatypes.push_back(syncer::APP_LIST);
+#endif
     datatypes.push_back(syncer::APP_SETTINGS);
     datatypes.push_back(syncer::AUTOFILL);
     datatypes.push_back(syncer::AUTOFILL_PROFILE);
diff --git a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
index 9eddfec..51cf89c 100644
--- a/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/single_client_app_list_sync_test.cc
@@ -31,11 +31,6 @@ class SingleClientAppListSyncTest : public SyncTest {
   virtual ~SingleClientAppListSyncTest() {}
 
   // SyncTest
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    SyncTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableSyncAppList);
-  }
-
   virtual bool SetupClients() OVERRIDE {
     if (!SyncTest::SetupClients())
       return false;
diff --git a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
index 6bf4ada..2495541 100644
--- a/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
+++ b/chrome/browser/sync/test/integration/two_client_app_list_sync_test.cc
@@ -55,11 +55,6 @@ class TwoClientAppListSyncTest : public SyncTest {
   virtual ~TwoClientAppListSyncTest() {}
 
   // SyncTest
-  virtual void SetUpCommandLine(CommandLine* command_line) OVERRIDE {
-    SyncTest::SetUpCommandLine(command_line);
-    command_line->AppendSwitch(switches::kEnableSyncAppList);
-  }
-
   virtual bool SetupClients() OVERRIDE {
     if (!SyncTest::SetupClients())
       return false;
diff --git a/chrome/browser/ui/app_list/app_list_syncable_service.cc b/chrome/browser/ui/app_list/app_list_syncable_service.cc
index a9eb72c..f931e10 100644
--- a/chrome/browser/ui/app_list/app_list_syncable_service.cc
+++ b/chrome/browser/ui/app_list/app_list_syncable_service.cc
@@ -33,8 +33,8 @@ namespace app_list {
 namespace {
 
 bool SyncAppListEnabled() {
-  return CommandLine::ForCurrentProcess()->HasSwitch(
-      ::switches::kEnableSyncAppList);
+  return !CommandLine::ForCurrentProcess()->HasSwitch(
+      ::switches::kDisableSyncAppList);
 }
 
 void UpdateSyncItemFromSync(const sync_pb::AppListSpecifics& specifics,
diff --git a/chrome/common/chrome_switches.cc b/chrome/common/chrome_switches.cc
index 95051f9..76164d1 100644
--- a/chrome/common/chrome_switches.cc
+++ b/chrome/common/chrome_switches.cc
@@ -423,6 +423,9 @@ const char kDisableSpdy31[]                 = "disable-spdy31";
 // Disables syncing browser data to a Google Account.
 const char kDisableSync[]                   = "disable-sync";
 
+// Disables syncing of the app list independent of extensions.
+const char kDisableSyncAppList[]            = "disable-sync-app-list";
+
 // Disables syncing of app settings.
 const char kDisableSyncAppSettings[]        = "disable-sync-app-settings";
 
@@ -758,9 +761,6 @@ const char kEnableSyncSyncedNotifications[] =
 // Disables sync/API based session sync implementation (back to legacy).
 const char kDisableSyncSessionsV2[] = "disable-sync-sessions-v2";
 
-// Enables syncing of the app list.
-const char kEnableSyncAppList[]             = "enable-sync-app-list";
-
 // Enables synced articles.
 const char kEnableSyncArticles[]            = "enable-sync-articles";
 
diff --git a/chrome/common/chrome_switches.h b/chrome/common/chrome_switches.h
index 1d4d0b6..a9fa735 100644
--- a/chrome/common/chrome_switches.h
+++ b/chrome/common/chrome_switches.h
@@ -125,6 +125,7 @@ extern const char kDisableSearchButtonInOmnibox[];
 extern const char kDisableScriptedPrintThrottling[];
 extern const char kDisableSpdy31[];
 extern const char kDisableSync[];
+extern const char kDisableSyncAppList[];
 extern const char kDisableSyncAppSettings[];
 extern const char kDisableSyncApps[];
 extern const char kDisableSyncAutofill[];
@@ -217,7 +218,6 @@ extern const char kEnableSpellingFeedbackFieldTrial[];
 extern const char kEnableStackedTabStrip[];
 extern const char kEnableStreamlinedHostedApps[];
 extern const char kEnableSuggestionsTabPage[];
-extern const char kEnableSyncAppList[];
 extern const char kEnableSyncArticles[];
 extern const char kEnableSyncSyncedNotifications[];
 extern const char kEnableThumbnailRetargeting[];