google_apis/gcm/engine/mcs_client_unittest.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: google_apis/gcm/engine/mcs_client_unittest.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: google_apis/gcm/engine/mcs_client_unittest.cc

diff --git a/google_apis/gcm/engine/mcs_client_unittest.cc b/google_apis/gcm/engine/mcs_client_unittest.cc

index 7eab21b05fe219d930fb182097f4d42a80d030b2..c4ab792d5327ec10e8ffb642ddff1c9d2dd5226c 100644

--- a/google_apis/gcm/engine/mcs_client_unittest.cc

+++ b/google_apis/gcm/engine/mcs_client_unittest.cc

@@ -9,7 +9,7 @@

#include "base/run_loop.h"

#include "base/strings/string_number_conversions.h"

#include "base/test/simple_test_clock.h"

-#include "components/encryptor/encryptor.h"

+#include "components/encryptor/os_crypt.h"

#include "google_apis/gcm/base/mcs_util.h"

#include "google_apis/gcm/engine/fake_connection_factory.h"

#include "google_apis/gcm/engine/fake_connection_handler.h"

@@ -146,7 +146,7 @@ MCSClientTest::MCSClientTest()

// On OSX, prevent the Keychain permissions popup during unit tests.

#if defined(OS_MACOSX)

- Encryptor::UseMockKeychain(true);

+ OSCrypt::UseMockKeychain(true);

#endif

// Advance the clock to a non-zero time.