google_apis/gcm/engine/gcm_store_impl.cc - Issue 221453003: Removing the mock-keychain related bool from GCMStore constructor

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/gcm_store_impl.cc

Issue 221453003: Removing the mock-keychain related bool from GCMStore constructor (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Moving all of the encryptor calls from tests to chrome binary Created 6 years, 8 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

« google_apis/gcm/engine/gcm_internals_builder.cc ('K') | « google_apis/gcm/engine/gcm_store_impl.h ('k') | google_apis/gcm/engine/gcm_store_impl_unittest.cc » ('j') | google_apis/gcm/engine/gcm_store_impl_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/gcm/engine/gcm_store_impl.cc

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

index 3a74127c4b9607a52bc76da8848e2c372096ea24..9bd562d83eda2b0d15b8dbf2f4ded7a0708246c7 100644

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

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

@@ -605,16 +605,11 @@ bool GCMStoreImpl::Backend::LoadLastCheckinTime(

}

GCMStoreImpl::GCMStoreImpl(

- bool use_mock_keychain,

const base::FilePath& path,

scoped_refptr<base::SequencedTaskRunner> blocking_task_runner)

: backend_(new Backend(path, base::MessageLoopProxy::current())),

blocking_task_runner_(blocking_task_runner),

weak_ptr_factory_(this) {

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

-#if defined(OS_MACOSX)

- OSCrypt::UseMockKeychain(use_mock_keychain);

-#endif

}

GCMStoreImpl::~GCMStoreImpl() {}