Index: chrome/browser/sync/test/integration/sync_test.cc |
diff --git a/chrome/browser/sync/test/integration/sync_test.cc b/chrome/browser/sync/test/integration/sync_test.cc |
index 9ac0a7b169b4b5b84b4f83293ad0ea1fe339c3ee..aae212a71733bf7340ca31472f35b95859a85a75 100644 |
--- a/chrome/browser/sync/test/integration/sync_test.cc |
+++ b/chrome/browser/sync/test/integration/sync_test.cc |
@@ -66,7 +66,7 @@ |
#include "components/invalidation/impl/profile_invalidation_provider.h" |
#include "components/invalidation/public/invalidation_service.h" |
#include "components/keyed_service/core/keyed_service.h" |
-#include "components/os_crypt/os_crypt.h" |
+#include "components/os_crypt/os_crypt_mocker.h" |
#include "components/search_engines/template_url_service.h" |
#include "components/signin/core/browser/profile_identity_provider.h" |
#include "components/signin/core/browser/signin_manager.h" |
@@ -262,9 +262,7 @@ void SyncTest::SetUp() { |
LOG(FATAL) << "Cannot run sync tests without GAIA credentials."; |
// Mock the Mac Keychain service. The real Keychain can block on user input. |
-#if defined(OS_MACOSX) |
- OSCrypt::UseMockKeychain(true); |
-#endif |
+ OSCryptMocker::SetUpWithSingleton(); |
vabr (Chromium)
2016/05/24 13:33:44
Missing OSCryptMocker::TearDown?
cfroussios
2016/05/25 13:13:09
Done.
|
// Start up a sync test server if one is needed and setup mock gaia responses. |
// Note: This must be done prior to the call to SetupClients() because we want |