Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3981)

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 10455012: [Sync] Add support for performing a GetKey on startup. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move GetEncryptionKey logic into GetUpdates Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/sync/test/integration/sync_test.cc
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc
index 05fca77de9942ab0493ae5f146e5e7916884356c..ca43f66919ccaa9a179001b33497973c27776aa2 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -197,6 +197,10 @@ void SyncTest::AddTestSwitches(CommandLine* cl) {
// Disable non-essential access of external network resources.
if (!cl->HasSwitch(switches::kDisableBackgroundNetworking))
cl->AppendSwitch(switches::kDisableBackgroundNetworking);
+
+ // TODO(sync): remove this once keystore encryption is enabled by default.
+ if (!cl->HasSwitch(switches::kSyncKeystoreEncryption))
+ cl->AppendSwitch(switches::kSyncKeystoreEncryption);
}
void SyncTest::AddOptionalTypesToCommandLine(CommandLine* cl) {}

Powered by Google App Engine
This is Rietveld 408576698