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

Unified Diff: chrome/browser/sync/js/js_sync_manager_observer_unittest.cc

Issue 8356026: [Sync] Cache encrypted types info in ProfileSyncService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix test failures Created 9 years, 2 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/js/js_sync_manager_observer_unittest.cc
diff --git a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
index aa1f0f1f282a13129705ac0cc393c73ea2bcfd67..d49bddb3ac8016a6c4a1f5a7a22d4c7d65773e0e 100644
--- a/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
+++ b/chrome/browser/sync/js/js_sync_manager_observer_unittest.cc
@@ -193,7 +193,9 @@ TEST_F(JsSyncManagerObserverTest, SensitiveNotifiations) {
TEST_F(JsSyncManagerObserverTest, OnEncryptionComplete) {
DictionaryValue expected_details;
ListValue* encrypted_type_values = new ListValue();
+ const bool encrypt_everything = false;
expected_details.Set("encryptedTypes", encrypted_type_values);
+ expected_details.SetBoolean("encryptEverything", encrypt_everything);
syncable::ModelTypeSet encrypted_types;
for (int i = syncable::FIRST_REAL_MODEL_TYPE;
@@ -208,7 +210,8 @@ TEST_F(JsSyncManagerObserverTest, OnEncryptionComplete) {
HandleJsEvent("onEncryptionComplete",
HasDetailsAsDictionary(expected_details)));
- js_sync_manager_observer_.OnEncryptionComplete(encrypted_types);
+ js_sync_manager_observer_.OnEncryptionComplete(
+ encrypted_types, encrypt_everything);
PumpLoop();
}

Powered by Google App Engine
This is Rietveld 408576698