Reland of land: Enable Wallet metadata sync.

chrome/browser/sync/profile_sync_components_factory_impl.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/sync/profile_sync_components_factory_impl.h"
 
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "build/build_config.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
@@ skipping 99 matching lines @@
     else
       disabled_types_str += ", " + disable_types_finch;
   }
 
   disabled_types = syncer::ModelTypeSetFromString(disabled_types_str);
   return disabled_types;
 }
 
 syncer::ModelTypeSet GetEnabledTypesFromCommandLine(
     const base::CommandLine& command_line) {
-  syncer::ModelTypeSet enabled_types;
-  if (command_line.HasSwitch(autofill::switches::kEnableWalletMetadataSync))
-    enabled_types.Put(syncer::AUTOFILL_WALLET_METADATA);
-
-  return enabled_types;
+  return syncer::ModelTypeSet();
 }
 
 }  // namespace
 
 ProfileSyncComponentsFactoryImpl::ProfileSyncComponentsFactoryImpl(
     Profile* profile,
     base::CommandLine* command_line,
     const GURL& sync_service_url,
     OAuth2TokenService* token_service,
     net::URLRequestContextGetter* url_request_context_getter)
@@ skipping 53 matching lines @@
   // enforced by the datatype controller. Register unless explicitly disabled.
   bool wallet_disabled = disabled_types.Has(syncer::AUTOFILL_WALLET_DATA);
   if (!wallet_disabled) {
     sync_service->RegisterDataTypeController(
         new browser_sync::AutofillWalletDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
             error_callback, sync_client, syncer::AUTOFILL_WALLET_DATA));
   }
 
-  // Wallet metadata sync depends on Wallet data sync and is disabled by
-  // default. Register if Wallet data is syncing and metadata sync is explicitly
-  // enabled.
-  if (!wallet_disabled && enabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
+  // Wallet metadata sync depends on Wallet data sync. Register if Wallet data
+  // is syncing and metadata sync is not explicitly disabled.
+  if (!wallet_disabled &&
+      !disabled_types.Has(syncer::AUTOFILL_WALLET_METADATA)) {
     sync_service->RegisterDataTypeController(
         new browser_sync::AutofillWalletDataTypeController(
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI),
             BrowserThread::GetMessageLoopProxyForThread(BrowserThread::DB),
             error_callback, sync_client, syncer::AUTOFILL_WALLET_METADATA));
   }
 
   // Bookmark sync is enabled by default.  Register unless explicitly
   // disabled.
   if (!disabled_types.Has(syncer::BOOKMARKS)) {
@@ skipping 339 matching lines @@
       new TypedUrlModelAssociator(sync_service,
                                   history_backend,
                                   error_handler);
   TypedUrlChangeProcessor* change_processor =
       new TypedUrlChangeProcessor(profile_,
                                   model_associator,
                                   history_backend,
                                   error_handler);
   return SyncComponents(model_associator, change_processor);
 }