summaryrefslogtreecommitdiffstats
path: root/chrome/browser/sync/glue
diff options
context:
space:
mode:
authorjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 01:49:54 +0000
committerjohnnyg@chromium.org <johnnyg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-15 01:49:54 +0000
commit3fd04f5fba94f0312e1ba5da0aca9fdd56578145 (patch)
tree09f7c30f34f9f89dd32e0048bd328ab3b7583c57 /chrome/browser/sync/glue
parent3372d98ec174306ff2beb1942216200ad3c8722b (diff)
downloadchromium_src-3fd04f5fba94f0312e1ba5da0aca9fdd56578145.zip
chromium_src-3fd04f5fba94f0312e1ba5da0aca9fdd56578145.tar.gz
chromium_src-3fd04f5fba94f0312e1ba5da0aca9fdd56578145.tar.bz2
Turn password sync on by default.
BUG=61252 TEST=none Review URL: http://codereview.chromium.org/6249006 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71534 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/sync/glue')
-rw-r--r--chrome/browser/sync/glue/sync_backend_host.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/sync/glue/sync_backend_host.cc b/chrome/browser/sync/glue/sync_backend_host.cc
index fcfb8fc9..3c3c8d8 100644
--- a/chrome/browser/sync/glue/sync_backend_host.cc
+++ b/chrome/browser/sync/glue/sync_backend_host.cc
@@ -130,8 +130,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);
if (enable_encryption)
registrar_.routing_info[syncable::NIGORI] = GROUP_PASSIVE;