| 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/util/cryptographer.h" | 5 #include "chrome/browser/sync/util/cryptographer.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/memory/scoped_ptr.h" | 9 #include "base/memory/scoped_ptr.h" |
| 10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| (...skipping 212 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 OnEncryptedTypesChanged(syncable::GetAllRealModelTypes(), | 223 OnEncryptedTypesChanged(syncable::GetAllRealModelTypes(), |
| 224 false)); | 224 false)); |
| 225 | 225 |
| 226 // Set all encrypted types | 226 // Set all encrypted types |
| 227 encrypted_types = syncable::GetAllRealModelTypes(); | 227 encrypted_types = syncable::GetAllRealModelTypes(); |
| 228 cryptographer.SetEncryptedTypesForTest(encrypted_types); | 228 cryptographer.SetEncryptedTypesForTest(encrypted_types); |
| 229 cryptographer.UpdateNigoriFromEncryptedTypes(&nigori); | 229 cryptographer.UpdateNigoriFromEncryptedTypes(&nigori); |
| 230 cryptographer2.UpdateEncryptedTypesFromNigori(nigori); | 230 cryptographer2.UpdateEncryptedTypesFromNigori(nigori); |
| 231 EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes()); | 231 EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes()); |
| 232 EXPECT_EQ(encrypted_types, cryptographer2.GetEncryptedTypes()); | 232 EXPECT_EQ(encrypted_types, cryptographer2.GetEncryptedTypes()); |
| 233 |
| 234 // Receiving an empty nigori should not reset any encrypted types. |
| 235 Mock::VerifyAndClearExpectations(&observer); |
| 236 EXPECT_CALL(observer, |
| 237 OnEncryptedTypesChanged(syncable::GetAllRealModelTypes(), |
| 238 false)); |
| 239 nigori = sync_pb::NigoriSpecifics(); |
| 240 cryptographer.UpdateEncryptedTypesFromNigori(nigori); |
| 241 EXPECT_EQ(encrypted_types, cryptographer.GetEncryptedTypes()); |
| 233 } | 242 } |
| 234 | 243 |
| 235 TEST(CryptographerTest, EncryptEverythingExplicit) { | 244 TEST(CryptographerTest, EncryptEverythingExplicit) { |
| 236 ModelTypeSet real_types = syncable::GetAllRealModelTypes(); | 245 ModelTypeSet real_types = syncable::GetAllRealModelTypes(); |
| 237 sync_pb::NigoriSpecifics specifics; | 246 sync_pb::NigoriSpecifics specifics; |
| 238 specifics.set_encrypt_everything(true); | 247 specifics.set_encrypt_everything(true); |
| 239 | 248 |
| 240 Cryptographer cryptographer; | 249 Cryptographer cryptographer; |
| 241 StrictMock<MockObserver> observer; | 250 StrictMock<MockObserver> observer; |
| 242 cryptographer.AddObserver(&observer); | 251 cryptographer.AddObserver(&observer); |
| (...skipping 112 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 355 *iter == syncable::BOOKMARKS) | 364 *iter == syncable::BOOKMARKS) |
| 356 EXPECT_EQ(1U, encrypted_types.count(*iter)); | 365 EXPECT_EQ(1U, encrypted_types.count(*iter)); |
| 357 else | 366 else |
| 358 EXPECT_EQ(0U, encrypted_types.count(*iter)); | 367 EXPECT_EQ(0U, encrypted_types.count(*iter)); |
| 359 } | 368 } |
| 360 | 369 |
| 361 cryptographer.RemoveObserver(&observer); | 370 cryptographer.RemoveObserver(&observer); |
| 362 } | 371 } |
| 363 | 372 |
| 364 } // namespace browser_sync | 373 } // namespace browser_sync |
| OLD | NEW |