chrome/browser/sync/test/integration/sync_test.cc - Issue 183953005: Rename components's Encryptor to OSEncrypt.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: similarity 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:

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 8bd527b175286da45451468bb965a933947cea67..5f1ed3c1c5897c6b19d25b32c9942e8a62f5cf5b 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"

@@ -179,7 +179,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.