Index: chrome/browser/sync/glue/sync_backend_host.cc |
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc |
index 7d833bd1ccc49dc56d53a1e82724079c6ccde2fc..0637850b6d9263a2d64cef70bcf9ac4125bbf376 100644 |
--- a/chrome/browser/sync/glue/sync_backend_host.cc |
+++ b/chrome/browser/sync/glue/sync_backend_host.cc |
@@ -120,8 +120,8 @@ void SyncBackendHost::Initialize( |
// TODO(tim): Remove this special case once NIGORI is populated by |
// default. We piggy back off of the passwords flag for now to not |
// require both encryption and passwords flags. |
- bool enable_encryption = CommandLine::ForCurrentProcess()->HasSwitch( |
- switches::kEnableSyncPasswords) || types.count(syncable::PASSWORDS); |
+ bool enable_encryption = !CommandLine::ForCurrentProcess()->HasSwitch( |
+ switches::kDisableSyncPasswords) || types.count(syncable::PASSWORDS) > 0; |
if (enable_encryption) |
registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE; |