Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3534)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/sync/test/integration/sync_test.cc

Issue 183953005: Rename components's Encryptor to OSEncrypt. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | components/encryptor/encryptor_password_mac.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 3c8e85b40351bac3499b3edfdbe3c1dc6a6e7b1d..b89f704d749e6f0e1e7dd0f5a8cf053734abadfb 100644
--- a/chrome/browser/sync/test/integration/sync_test.cc
+++ b/chrome/browser/sync/test/integration/sync_test.cc
@@ -41,7 +41,7 @@
#include "chrome/common/chrome_switches.h"
#include "chrome/test/base/testing_browser_process.h"
#include "chrome/test/base/ui_test_utils.h"
-#include "components/encryptor/encryptor.h"
+#include "components/encryptor/os_crypt.h"
#include "content/public/browser/web_contents.h"
#include "content/public/test/test_browser_thread.h"
#include "google_apis/gaia/gaia_urls.h"
@@ -180,7 +180,7 @@ void SyncTest::SetUp() {
// Mock the Mac Keychain service. The real Keychain can block on user input.
#if defined(OS_MACOSX)
- Encryptor::UseMockKeychain(true);
+ OSCrypt::UseMockKeychain(true);
#endif
// Start up a sync test server if one is needed and setup mock gaia responses.
« no previous file with comments | « chrome/browser/signin/mutable_profile_oauth2_token_service_unittest.cc ('k') | chrome/test/base/in_process_browser_test.cc » ('j') | components/encryptor/encryptor_password_mac.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698