Index: components/sync/core_impl/sync_manager_impl_unittest.cc |
diff --git a/components/sync/core_impl/sync_manager_impl_unittest.cc b/components/sync/core_impl/sync_manager_impl_unittest.cc |
index e0c24297814dfdc213bb9ebd7d9fd5d6e39c60cb..3c0f595bfdfc1ae8b52905ef0f3ea2978250d215 100644 |
--- a/components/sync/core_impl/sync_manager_impl_unittest.cc |
+++ b/components/sync/core_impl/sync_manager_impl_unittest.cc |
@@ -255,6 +255,7 @@ class SyncApiTest : public testing::Test { |
UserShare* user_share(); |
syncable::Directory* dir(); |
SyncEncryptionHandler* encryption_handler(); |
+ PassphraseType GetPassphraseType(BaseTransaction* trans); |
private: |
base::MessageLoop message_loop_; |
@@ -273,6 +274,10 @@ SyncEncryptionHandler* SyncApiTest::encryption_handler() { |
return test_user_share_.encryption_handler(); |
} |
+PassphraseType SyncApiTest::GetPassphraseType(BaseTransaction* trans) { |
+ return dir()->GetNigoriHandler()->GetPassphraseType(trans->GetWrappedTrans()); |
+} |
+ |
bool SyncApiTest::ReloadDir() { |
return test_user_share_.Reload(); |
} |
@@ -1128,6 +1133,16 @@ class SyncManagerTest : public testing::Test, |
trans->GetWrappedTrans()); |
} |
+ PassphraseType GetPassphraseType() { |
+ ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); |
+ return GetPassphraseTypeWithTrans(&trans); |
+ } |
+ |
+ PassphraseType GetPassphraseTypeWithTrans(BaseTransaction* trans) { |
+ return trans->GetDirectory()->GetNigoriHandler()->GetPassphraseType( |
+ trans->GetWrappedTrans()); |
+ } |
+ |
void SimulateInvalidatorEnabledForTest(bool is_enabled) { |
DCHECK(sync_manager_.thread_checker_.CalledOnValidThread()); |
sync_manager_.SetInvalidatorEnabled(is_enabled); |
@@ -1156,8 +1171,7 @@ class SyncManagerTest : public testing::Test, |
void SetImplicitPassphraseAndCheck(const std::string& passphrase) { |
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(passphrase, |
false); |
- EXPECT_EQ(PassphraseType::IMPLICIT_PASSPHRASE, |
- sync_manager_.GetEncryptionHandler()->GetPassphraseType()); |
+ EXPECT_EQ(PassphraseType::IMPLICIT_PASSPHRASE, GetPassphraseType()); |
} |
void SetCustomPassphraseAndCheck(const std::string& passphrase) { |
@@ -1165,8 +1179,7 @@ class SyncManagerTest : public testing::Test, |
OnPassphraseTypeChanged(PassphraseType::CUSTOM_PASSPHRASE, _)); |
sync_manager_.GetEncryptionHandler()->SetEncryptionPassphrase(passphrase, |
true); |
- EXPECT_EQ(PassphraseType::CUSTOM_PASSPHRASE, |
- sync_manager_.GetEncryptionHandler()->GetPassphraseType()); |
+ EXPECT_EQ(PassphraseType::CUSTOM_PASSPHRASE, GetPassphraseType()); |
} |
bool HasUnrecoverableError() { |
@@ -1499,8 +1512,7 @@ TEST_F(SyncManagerTest, SupplyPendingGAIAPass) { |
OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); |
ExpectPassphraseAcceptance(); |
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("passphrase2"); |
- EXPECT_EQ(PassphraseType::IMPLICIT_PASSPHRASE, |
- sync_manager_.GetEncryptionHandler()->GetPassphraseType()); |
+ EXPECT_EQ(PassphraseType::IMPLICIT_PASSPHRASE, GetPassphraseType()); |
EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); |
{ |
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); |
@@ -1625,8 +1637,7 @@ TEST_F(SyncManagerTest, SupplyPendingExplicitPass) { |
OnBootstrapTokenUpdated(_, PASSPHRASE_BOOTSTRAP_TOKEN)); |
ExpectPassphraseAcceptance(); |
sync_manager_.GetEncryptionHandler()->SetDecryptionPassphrase("explicit"); |
- EXPECT_EQ(PassphraseType::CUSTOM_PASSPHRASE, |
- sync_manager_.GetEncryptionHandler()->GetPassphraseType()); |
+ EXPECT_EQ(PassphraseType::CUSTOM_PASSPHRASE, GetPassphraseType()); |
EXPECT_FALSE(IsEncryptEverythingEnabledForTest()); |
{ |
ReadTransaction trans(FROM_HERE, sync_manager_.GetUserShare()); |