OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/sync/js/js_sync_manager_observer.h" | 5 #include "chrome/browser/sync/js/js_sync_manager_observer.h" |
6 | 6 |
7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
8 #include "base/location.h" | 8 #include "base/location.h" |
9 #include "base/message_loop.h" | 9 #include "base/message_loop.h" |
10 #include "base/values.h" | 10 #include "base/values.h" |
(...skipping 175 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
186 HasDetailsAsDictionary(redacted_bootstrap_token_details))); | 186 HasDetailsAsDictionary(redacted_bootstrap_token_details))); |
187 | 187 |
188 js_sync_manager_observer_.OnUpdatedToken("sensitive_token"); | 188 js_sync_manager_observer_.OnUpdatedToken("sensitive_token"); |
189 js_sync_manager_observer_.OnPassphraseAccepted("sensitive_token"); | 189 js_sync_manager_observer_.OnPassphraseAccepted("sensitive_token"); |
190 PumpLoop(); | 190 PumpLoop(); |
191 } | 191 } |
192 | 192 |
193 TEST_F(JsSyncManagerObserverTest, OnEncryptionComplete) { | 193 TEST_F(JsSyncManagerObserverTest, OnEncryptionComplete) { |
194 DictionaryValue expected_details; | 194 DictionaryValue expected_details; |
195 ListValue* encrypted_type_values = new ListValue(); | 195 ListValue* encrypted_type_values = new ListValue(); |
| 196 const bool encrypt_everything = false; |
196 expected_details.Set("encryptedTypes", encrypted_type_values); | 197 expected_details.Set("encryptedTypes", encrypted_type_values); |
| 198 expected_details.SetBoolean("encryptEverything", encrypt_everything); |
197 syncable::ModelTypeSet encrypted_types; | 199 syncable::ModelTypeSet encrypted_types; |
198 | 200 |
199 for (int i = syncable::FIRST_REAL_MODEL_TYPE; | 201 for (int i = syncable::FIRST_REAL_MODEL_TYPE; |
200 i < syncable::MODEL_TYPE_COUNT; ++i) { | 202 i < syncable::MODEL_TYPE_COUNT; ++i) { |
201 syncable::ModelType type = syncable::ModelTypeFromInt(i); | 203 syncable::ModelType type = syncable::ModelTypeFromInt(i); |
202 encrypted_types.insert(type); | 204 encrypted_types.insert(type); |
203 encrypted_type_values->Append(Value::CreateStringValue( | 205 encrypted_type_values->Append(Value::CreateStringValue( |
204 syncable::ModelTypeToString(type))); | 206 syncable::ModelTypeToString(type))); |
205 } | 207 } |
206 | 208 |
207 EXPECT_CALL(mock_js_event_handler_, | 209 EXPECT_CALL(mock_js_event_handler_, |
208 HandleJsEvent("onEncryptionComplete", | 210 HandleJsEvent("onEncryptionComplete", |
209 HasDetailsAsDictionary(expected_details))); | 211 HasDetailsAsDictionary(expected_details))); |
210 | 212 |
211 js_sync_manager_observer_.OnEncryptionComplete(encrypted_types); | 213 js_sync_manager_observer_.OnEncryptionComplete( |
| 214 encrypted_types, encrypt_everything); |
212 PumpLoop(); | 215 PumpLoop(); |
213 } | 216 } |
214 | 217 |
215 } // namespace | 218 } // namespace |
216 } // namespace browser_sync | 219 } // namespace browser_sync |
OLD | NEW |