diff options
| author | kuan <kuan@chromium.org> | 2015-10-06 15:08:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-10-06 22:10:29 +0000 |
| commit | da301edaf678a3943bb03108349e15e1fd226aec (patch) | |
| tree | 842708bbcf7cced01d759aa50d767b98c836a7fd /chrome/browser/sync/profile_sync_components_factory_impl.cc | |
| parent | 662ed852e0f73f9676d3c1aedee5f144a00e6581 (diff) | |
| download | chromium_src-da301edaf678a3943bb03108349e15e1fd226aec.zip chromium_src-da301edaf678a3943bb03108349e15e1fd226aec.tar.gz chromium_src-da301edaf678a3943bb03108349e15e1fd226aec.tar.bz2 | |
Revert of Enable Wallet metadata sync. (patchset #2 id:20001 of https://codereview.chromium.org/1387193003/ )
Reason for revert:
broke builds:
https://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/10568
https://build.chromium.org/p/chromium.linux/builders/Linux%20GN/builds/32936
etc...
Original issue's description:
> Enable Wallet metadata sync.
>
> BUG=481595
>
> Committed: https://crrev.com/90c4e9472b95803cf8220cd749a25523aa80b0b3
> Cr-Commit-Position: refs/heads/master@{#352686}
TBR=zea@chromium.org,estade@chromium.org,rouslan@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=481595
Review URL: https://codereview.chromium.org/1375323006
Cr-Commit-Position: refs/heads/master@{#352698}
Diffstat (limited to 'chrome/browser/sync/profile_sync_components_factory_impl.cc')
| -rw-r--r-- | chrome/browser/sync/profile_sync_components_factory_impl.cc | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/chrome/browser/sync/profile_sync_components_factory_impl.cc b/chrome/browser/sync/profile_sync_components_factory_impl.cc index 5b564fd..207a0a7 100644 --- a/chrome/browser/sync/profile_sync_components_factory_impl.cc +++ b/chrome/browser/sync/profile_sync_components_factory_impl.cc @@ -115,7 +115,11 @@ syncer::ModelTypeSet GetDisabledTypesFromCommandLine( syncer::ModelTypeSet GetEnabledTypesFromCommandLine( const base::CommandLine& command_line) { - return syncer::ModelTypeSet(); + syncer::ModelTypeSet enabled_types; + if (command_line.HasSwitch(autofill::switches::kEnableWalletMetadataSync)) + enabled_types.Put(syncer::AUTOFILL_WALLET_METADATA); + + return enabled_types; } } // namespace @@ -189,10 +193,10 @@ void ProfileSyncComponentsFactoryImpl::RegisterCommonDataTypes( syncer::AUTOFILL_WALLET_DATA)); } - // 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)) { + // 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)) { sync_service->RegisterDataTypeController( new browser_sync::AutofillWalletDataTypeController( BrowserThread::GetMessageLoopProxyForThread(BrowserThread::UI), |