diff options
Diffstat (limited to 'sync')
9 files changed, 64 insertions, 64 deletions
diff --git a/sync/android/java/src/org/chromium/sync/PassphraseType.java b/sync/android/java/src/org/chromium/sync/PassphraseType.java index 8ef3d5a..8aa5879 100644 --- a/sync/android/java/src/org/chromium/sync/PassphraseType.java +++ b/sync/android/java/src/org/chromium/sync/PassphraseType.java @@ -74,15 +74,15 @@ public enum PassphraseType implements Parcelable { /** * Get the types that are allowed to be enabled from the current type. * - * @param encryptEverythingAllowed Whether encrypting all data is allowed. + * @param isEncryptEverythingAllowed Whether encrypting all data is allowed. */ - public Set<PassphraseType> getAllowedTypes(boolean encryptEverythingAllowed) { + public Set<PassphraseType> getAllowedTypes(boolean isEncryptEverythingAllowed) { Set<PassphraseType> allowedTypes = new HashSet<>(); switch (this) { case IMPLICIT_PASSPHRASE: // Intentional fall through. case KEYSTORE_PASSPHRASE: allowedTypes.add(this); - if (encryptEverythingAllowed) { + if (isEncryptEverythingAllowed) { allowedTypes.add(CUSTOM_PASSPHRASE); } break; diff --git a/sync/internal_api/public/sync_encryption_handler.h b/sync/internal_api/public/sync_encryption_handler.h index 0e7edc5..9dd497d 100644 --- a/sync/internal_api/public/sync_encryption_handler.h +++ b/sync/internal_api/public/sync_encryption_handler.h @@ -184,7 +184,7 @@ class SYNC_EXPORT SyncEncryptionHandler { // Whether encryption of all datatypes is enabled. If false, only sensitive // types are encrypted. - virtual bool EncryptEverythingEnabled() const = 0; + virtual bool IsEncryptEverythingEnabled() const = 0; // Returns the current state of the passphrase needed to decrypt the // bag of encryption keys in the nigori node. diff --git a/sync/internal_api/sync_encryption_handler_impl.cc b/sync/internal_api/sync_encryption_handler_impl.cc index 50f0ed1..b408065 100644 --- a/sync/internal_api/sync_encryption_handler_impl.cc +++ b/sync/internal_api/sync_encryption_handler_impl.cc @@ -636,7 +636,7 @@ void SyncEncryptionHandlerImpl::EnableEncryptEverything() { ReEncryptEverything(&trans); } -bool SyncEncryptionHandlerImpl::EncryptEverythingEnabled() const { +bool SyncEncryptionHandlerImpl::IsEncryptEverythingEnabled() const { DCHECK(thread_checker_.CalledOnValidThread()); return encrypt_everything_; } diff --git a/sync/internal_api/sync_encryption_handler_impl.h b/sync/internal_api/sync_encryption_handler_impl.h index b621484..1335ed6 100644 --- a/sync/internal_api/sync_encryption_handler_impl.h +++ b/sync/internal_api/sync_encryption_handler_impl.h @@ -65,7 +65,7 @@ class SYNC_EXPORT_PRIVATE SyncEncryptionHandlerImpl bool is_explicit) override; void SetDecryptionPassphrase(const std::string& passphrase) override; void EnableEncryptEverything() override; - bool EncryptEverythingEnabled() const override; + bool IsEncryptEverythingEnabled() const override; PassphraseType GetPassphraseType() const override; // NigoriHandler implementation. diff --git a/sync/internal_api/sync_encryption_handler_impl_unittest.cc b/sync/internal_api/sync_encryption_handler_impl_unittest.cc index c25571b..1f18a08 100644 --- a/sync/internal_api/sync_encryption_handler_impl_unittest.cc +++ b/sync/internal_api/sync_encryption_handler_impl_unittest.cc @@ -267,7 +267,7 @@ class SyncEncryptionHandlerImplTest : public ::testing::Test { encryption_handler()->Init(); EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); } @@ -298,7 +298,7 @@ class SyncEncryptionHandlerImplTest : public ::testing::Test { encryption_handler()->Init(); EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); } @@ -333,7 +333,7 @@ class SyncEncryptionHandlerImplTest : public ::testing::Test { encryption_handler()->Init(); EXPECT_FALSE(encryption_handler()->MigratedToKeystore()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), passphrase_type); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); } @@ -452,7 +452,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) { OnEncryptedTypesChanged( HasModelTypes(EncryptableUserTypes()), true)); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); ModelTypeSet encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.Equals( @@ -465,7 +465,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingExplicit) { trans.GetWrappedTrans()); } - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.HasAll(EncryptableUserTypes())); @@ -489,7 +489,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) { OnEncryptedTypesChanged( HasModelTypes(EncryptableUserTypes()), true)); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); ModelTypeSet encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.Equals( @@ -502,7 +502,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EncryptEverythingImplicit) { trans.GetWrappedTrans()); } - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.HasAll(EncryptableUserTypes())); @@ -534,7 +534,7 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) { OnEncryptedTypesChanged( HasModelTypes(expected_encrypted_types), false)); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); ModelTypeSet encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.Equals( @@ -547,7 +547,7 @@ TEST_F(SyncEncryptionHandlerImplTest, UnknownSensitiveTypes) { trans.GetWrappedTrans()); } - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); encrypted_types = encryption_handler()->GetEncryptedTypesUnsafe(); EXPECT_TRUE(encrypted_types.Equals( ModelTypeSet(BOOKMARKS, PASSWORDS, WIFI_CREDENTIALS))); @@ -635,7 +635,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldNigori) { GetCryptographer()->CanDecryptUsingDefaultKey( nigori.encryption_keybag())); } - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); } // Ensure setting the keystore key works, updates the bootstrap token, and @@ -907,7 +907,7 @@ TEST_F(SyncEncryptionHandlerImplTest, MigrateOnKeystoreKeyAvailableImplicit) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_EQ(KEYSTORE_PASSPHRASE, encryption_handler()->GetPassphraseType()); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kCurKey); } @@ -958,7 +958,7 @@ TEST_F(SyncEncryptionHandlerImplTest, const base::Time migration_time = encryption_handler()->migration_time(); EXPECT_EQ(FROZEN_IMPLICIT_PASSPHRASE, encryption_handler()->GetPassphraseType()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(FROZEN_IMPLICIT_PASSPHRASE, kCurKey); // We need the passphrase bootstrap token, but OnBootstrapTokenUpdated(_, @@ -1028,7 +1028,7 @@ TEST_F(SyncEncryptionHandlerImplTest, const base::Time migration_time = encryption_handler()->migration_time(); EXPECT_EQ(CUSTOM_PASSPHRASE, encryption_handler()->GetPassphraseType()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(CUSTOM_PASSPHRASE, kCurKey); VerifyRestoreAfterCustomPassphrase(TimeToProtoTime(migration_time), kCurKey, @@ -1087,7 +1087,7 @@ TEST_F(SyncEncryptionHandlerImplTest, const base::Time migration_time = encryption_handler()->migration_time(); EXPECT_EQ(CUSTOM_PASSPHRASE, encryption_handler()->GetPassphraseType()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(CUSTOM_PASSPHRASE, kCurKey); VerifyRestoreAfterCustomPassphrase(TimeToProtoTime(migration_time), kCurKey, @@ -1150,7 +1150,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveMigratedNigoriKeystorePass) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, KEYSTORE_PASSPHRASE, kCurKey); // Check that the cryptographer still encrypts with the current key. @@ -1218,7 +1218,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveMigratedNigoriFrozenImplicitPass) { EXPECT_EQ(FROZEN_IMPLICIT_PASSPHRASE, encryption_handler()->GetPassphraseType()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); @@ -1296,7 +1296,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveMigratedNigoriCustomPass) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_EQ(CUSTOM_PASSPHRASE, encryption_handler()->GetPassphraseType()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); EXPECT_CALL(*observer(), OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); @@ -1364,7 +1364,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveUnmigratedNigoriAfterMigration) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(migration_time, CUSTOM_PASSPHRASE, kCurKey); { @@ -1404,7 +1404,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveUnmigratedNigoriAfterMigration) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCurKey); // We need the passphrase bootstrap token, but OnBootstrapTokenUpdated(_, @@ -1455,7 +1455,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldMigratedNigori) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, CUSTOM_PASSPHRASE, kCurKey); { @@ -1502,7 +1502,7 @@ TEST_F(SyncEncryptionHandlerImplTest, ReceiveOldMigratedNigori) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(migration_time, CUSTOM_PASSPHRASE, kCurKey); // We need the passphrase bootstrap token, but OnBootstrapTokenUpdated(_, @@ -1561,7 +1561,7 @@ TEST_F(SyncEncryptionHandlerImplTest, SetKeystoreAfterReceivingMigratedNigori) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); EXPECT_CALL(*observer(), OnPassphraseAccepted()); @@ -1581,7 +1581,7 @@ TEST_F(SyncEncryptionHandlerImplTest, SetKeystoreAfterReceivingMigratedNigori) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, KEYSTORE_PASSPHRASE, kCurKey); // Check that the cryptographer still encrypts with the current key. @@ -1651,7 +1651,7 @@ TEST_F(SyncEncryptionHandlerImplTest, SetCustomPassAfterMigration) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); const char kNewKey[] = "new_key"; @@ -1679,7 +1679,7 @@ TEST_F(SyncEncryptionHandlerImplTest, SetCustomPassAfterMigration) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); EXPECT_FALSE(encryption_handler()->custom_passphrase_time().is_null()); VerifyMigratedNigoriWithTimestamp(migration_time, CUSTOM_PASSPHRASE, kNewKey); @@ -1760,7 +1760,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); EXPECT_CALL(*observer(), @@ -1773,7 +1773,7 @@ TEST_F(SyncEncryptionHandlerImplTest, OnEncryptionComplete()); encryption_handler()->SetDecryptionPassphrase(kOldKey); EXPECT_TRUE(GetCryptographer()->is_ready()); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); const char kNewKey[] = "new_key"; @@ -1798,7 +1798,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), CUSTOM_PASSPHRASE); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); EXPECT_FALSE(encryption_handler()->custom_passphrase_time().is_null()); VerifyMigratedNigoriWithTimestamp(migration_time, CUSTOM_PASSPHRASE, kNewKey); @@ -1878,7 +1878,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); EXPECT_CALL(*observer(), @@ -1891,7 +1891,7 @@ TEST_F(SyncEncryptionHandlerImplTest, OnEncryptionComplete()); encryption_handler()->SetDecryptionPassphrase(kOldKey); EXPECT_TRUE(GetCryptographer()->is_ready()); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); // Should get dropped on the floor silently. @@ -1900,7 +1900,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, KEYSTORE_PASSPHRASE, kOldKey); // Check that the cryptographer can decrypt the old key. @@ -1973,7 +1973,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->has_pending_keys()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); Mock::VerifyAndClearExpectations(observer()); EXPECT_CALL(*observer(), @@ -2007,7 +2007,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(FROZEN_IMPLICIT_PASSPHRASE, encryption_handler()->GetPassphraseType()); - EXPECT_TRUE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_TRUE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigoriWithTimestamp(1, FROZEN_IMPLICIT_PASSPHRASE, kCurKey); // Check that the cryptographer is encrypting using the frozen current key. @@ -2053,7 +2053,7 @@ TEST_F(SyncEncryptionHandlerImplTest, OnEncryptionComplete()); encryption_handler()->Init(); EXPECT_TRUE(GetCryptographer()->is_ready()); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); { EXPECT_CALL(*observer(), @@ -2100,7 +2100,7 @@ TEST_F(SyncEncryptionHandlerImplTest, EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kCurKey); } @@ -2156,7 +2156,7 @@ TEST_F(SyncEncryptionHandlerImplTest, RotateKeysGaiaDefault) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kKeystoreKey); } @@ -2210,7 +2210,7 @@ TEST_F(SyncEncryptionHandlerImplTest, RotateKeysKeystoreDefault) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kKeystoreKey); } @@ -2293,7 +2293,7 @@ TEST_F(SyncEncryptionHandlerImplTest, RotateKeysGaiaDefaultOnInit) { EXPECT_TRUE(encryption_handler()->MigratedToKeystore()); EXPECT_TRUE(GetCryptographer()->is_ready()); EXPECT_EQ(encryption_handler()->GetPassphraseType(), KEYSTORE_PASSPHRASE); - EXPECT_FALSE(encryption_handler()->EncryptEverythingEnabled()); + EXPECT_FALSE(encryption_handler()->IsEncryptEverythingEnabled()); VerifyMigratedNigori(KEYSTORE_PASSPHRASE, kKeystoreKey); } diff --git a/sync/internal_api/sync_manager_impl_unittest.cc b/sync/internal_api/sync_manager_impl_unittest.cc index 6aee8e3..04b97b5 100644 --- a/sync/internal_api/sync_manager_impl_unittest.cc +++ b/sync/internal_api/sync_manager_impl_unittest.cc @@ -1046,8 +1046,8 @@ class SyncManagerTest : public testing::Test, // Returns true if we are currently encrypting all sync data. May // be called on any thread. - bool EncryptEverythingEnabledForTest() { - return sync_manager_.GetEncryptionHandler()->EncryptEverythingEnabled(); + bool IsEncryptEverythingEnabledForTest() { + return sync_manager_.GetEncryptionHandler()->IsEncryptEverythingEnabled(); } // Gets the set of encrypted types from the cryptographer @@ -1161,7 +1161,7 @@ TEST_F(SyncManagerTest, RefreshEncryptionReady) { const ModelTypeSet encrypted_types = GetEncryptedTypes(); EXPECT_TRUE(encrypted_types.Has(PASSWORDS)); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); @@ -1190,7 +1190,7 @@ TEST_F(SyncManagerTest, RefreshEncryptionNotReady) { const ModelTypeSet encrypted_types = GetEncryptedTypes(); EXPECT_TRUE(encrypted_types.Has(PASSWORDS)); // Hardcoded. - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); } // Attempt to refresh encryption when nigori is empty. @@ -1206,7 +1206,7 @@ TEST_F(SyncManagerTest, RefreshEncryptionEmptyNigori) { const ModelTypeSet encrypted_types = GetEncryptedTypes(); EXPECT_TRUE(encrypted_types.Has(PASSWORDS)); // Hardcoded. - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); @@ -1228,7 +1228,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithNoData) { HasModelTypes(EncryptableUserTypes()), true)); EXPECT_CALL(encryption_observer_, OnEncryptionComplete()); sync_manager_.GetEncryptionHandler()->EnableEncryptEverything(); - EXPECT_TRUE(EncryptEverythingEnabledForTest()); + EXPECT_TRUE(IsEncryptEverythingEnabledForTest()); } TEST_F(SyncManagerTest, EncryptDataTypesWithData) { @@ -1279,7 +1279,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) { HasModelTypes(EncryptableUserTypes()), true)); EXPECT_CALL(encryption_observer_, OnEncryptionComplete()); sync_manager_.GetEncryptionHandler()->EnableEncryptEverything(); - EXPECT_TRUE(EncryptEverythingEnabledForTest()); + EXPECT_TRUE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals( @@ -1304,7 +1304,7 @@ TEST_F(SyncManagerTest, EncryptDataTypesWithData) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetCustomPassphraseAndCheck("new_passphrase"); - EXPECT_TRUE(EncryptEverythingEnabledForTest()); + EXPECT_TRUE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); EXPECT_TRUE(GetEncryptedTypesWithTrans(&trans).Equals( @@ -1341,7 +1341,7 @@ TEST_F(SyncManagerTest, SetInitialGaiaPass) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetImplicitPassphraseAndCheck("new_passphrase"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); ReadNode node(&trans); @@ -1370,7 +1370,7 @@ TEST_F(SyncManagerTest, UpdateGaiaPass) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetImplicitPassphraseAndCheck("new_passphrase"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); Cryptographer* cryptographer = trans.GetCryptographer(); @@ -1412,7 +1412,7 @@ TEST_F(SyncManagerTest, SetPassphraseWithPassword) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetCustomPassphraseAndCheck("new_passphrase"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); Cryptographer* cryptographer = trans.GetCryptographer(); @@ -1464,7 +1464,7 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPass) { sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("passphrase2"); EXPECT_EQ(IMPLICIT_PASSPHRASE, sync_manager_.GetEncryptionHandler()->GetPassphraseType()); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); Cryptographer* cryptographer = trans.GetCryptographer(); @@ -1517,7 +1517,7 @@ TEST_F(SyncManagerTest, SupplyPendingOldGAIAPass) { EXPECT_CALL(encryption_observer_, OnPassphraseRequired(_,_)); EXPECT_CALL(encryption_observer_, OnCryptographerStateChanged(_)); SetImplicitPassphraseAndCheck("new_gaia"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); testing::Mock::VerifyAndClearExpectations(&encryption_observer_); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); @@ -1590,7 +1590,7 @@ TEST_F(SyncManagerTest, SupplyPendingExplicitPass) { sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("explicit"); EXPECT_EQ(CUSTOM_PASSPHRASE, sync_manager_.GetEncryptionHandler()->GetPassphraseType()); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); Cryptographer* cryptographer = trans.GetCryptographer(); @@ -1628,7 +1628,7 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPassUserProvided) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetImplicitPassphraseAndCheck("passphrase"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); Cryptographer* cryptographer = trans.GetCryptographer(); @@ -1655,7 +1655,7 @@ TEST_F(SyncManagerTest, SetPassphraseWithEmptyPasswordNode) { OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); ExpectPassphraseAcceptance(); SetCustomPassphraseAndCheck("new_passphrase"); - EXPECT_FALSE(EncryptEverythingEnabledForTest()); + EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); ReadNode password_node(&trans); @@ -1744,7 +1744,7 @@ TEST_F(SyncManagerTest, EncryptBookmarksWithLegacyData) { HasModelTypes(EncryptableUserTypes()), true)); EXPECT_CALL(encryption_observer_, OnEncryptionComplete()); sync_manager_.GetEncryptionHandler()->EnableEncryptEverything(); - EXPECT_TRUE(EncryptEverythingEnabledForTest()); + EXPECT_TRUE(IsEncryptEverythingEnabledForTest()); { ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); diff --git a/sync/internal_api/sync_rollback_manager_base.cc b/sync/internal_api/sync_rollback_manager_base.cc index ab2d97e..0134422 100644 --- a/sync/internal_api/sync_rollback_manager_base.cc +++ b/sync/internal_api/sync_rollback_manager_base.cc @@ -26,7 +26,7 @@ class DummyEntryptionHandler : public syncer::SyncEncryptionHandler { bool is_explicit) override {} void SetDecryptionPassphrase(const std::string& passphrase) override {} void EnableEncryptEverything() override {} - bool EncryptEverythingEnabled() const override { return false; } + bool IsEncryptEverythingEnabled() const override { return false; } syncer::PassphraseType GetPassphraseType() const override { return syncer::KEYSTORE_PASSPHRASE; } diff --git a/sync/test/fake_sync_encryption_handler.cc b/sync/test/fake_sync_encryption_handler.cc index 3a60b07..d524e60 100644 --- a/sync/test/fake_sync_encryption_handler.cc +++ b/sync/test/fake_sync_encryption_handler.cc @@ -118,7 +118,7 @@ void FakeSyncEncryptionHandler::EnableEncryptEverything() { OnEncryptedTypesChanged(encrypted_types_, encrypt_everything_)); } -bool FakeSyncEncryptionHandler::EncryptEverythingEnabled() const { +bool FakeSyncEncryptionHandler::IsEncryptEverythingEnabled() const { return encrypt_everything_; } diff --git a/sync/test/fake_sync_encryption_handler.h b/sync/test/fake_sync_encryption_handler.h index c3ba20d..7853947 100644 --- a/sync/test/fake_sync_encryption_handler.h +++ b/sync/test/fake_sync_encryption_handler.h @@ -36,7 +36,7 @@ class FakeSyncEncryptionHandler : public SyncEncryptionHandler, bool is_explicit) override; void SetDecryptionPassphrase(const std::string& passphrase) override; void EnableEncryptEverything() override; - bool EncryptEverythingEnabled() const override; + bool IsEncryptEverythingEnabled() const override; PassphraseType GetPassphraseType() const override; // NigoriHandler implemenation. |