Add a declarative way in c/b/s/sync_prefs.cc to say which data types have prefs

chrome/browser/ui/webui/sync_setup_handler.cc

 // Copyright (c) 2012 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/ui/webui/sync_setup_handler.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 86 matching lines @@
 
   bool sync_autofill;
   if (!result->GetBoolean("syncAutofill", &sync_autofill))
     return false;
   if (sync_autofill)
     config->data_types.Put(syncable::AUTOFILL);
 
   bool sync_extensions;
   if (!result->GetBoolean("syncExtensions", &sync_extensions))
     return false;
-  if (sync_extensions) {
+  if (sync_extensions)
     config->data_types.Put(syncable::EXTENSIONS);
-    config->data_types.Put(syncable::EXTENSION_SETTINGS);
-  }
 
   bool sync_typed_urls;
   if (!result->GetBoolean("syncTypedUrls", &sync_typed_urls))
     return false;
   if (sync_typed_urls)
     config->data_types.Put(syncable::TYPED_URLS);
 
   bool sync_sessions;
   if (!result->GetBoolean("syncSessions", &sync_sessions))
     return false;
   if (sync_sessions)
     config->data_types.Put(syncable::SESSIONS);
 
   bool sync_apps;
   if (!result->GetBoolean("syncApps", &sync_apps))
     return false;
-  if (sync_apps) {
+  if (sync_apps)
     config->data_types.Put(syncable::APPS);
-    config->data_types.Put(syncable::APP_SETTINGS);
-  }
 
   // Encryption settings.
   if (!result->GetBoolean("encryptAllData", &config->encrypt_all))
     return false;
 
   // Passphrase settings.
   bool have_passphrase;
   if (!result->GetBoolean("usePassphrase", &have_passphrase))
     return false;
 
@@ skipping 647 matching lines @@
     if (i != current_profile_index && AreUserNamesEqual(
         cache.GetUserNameOfProfileAtIndex(i), username_utf16)) {
       *error_message = l10n_util::GetStringUTF16(
           IDS_SYNC_USER_NAME_IN_USE_ERROR);
       return false;
     }
   }
 
   return true;
 }