google_apis/gcm/engine/gcm_store_impl_unittest.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_unittest.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.cc ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: google_apis/gcm/engine/gcm_store_impl_unittest.cc

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

index af5fc3addaa0fcfb0a3a795bf3776c8fcff491e3..a13e8fa947373496d6d35a51a3c98b7a969bc8d1 100644

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

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

@@ -16,6 +16,7 @@

#include "base/strings/string_number_conversions.h"

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

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

+#include "google_apis/gcm/engine/gcm_internals_builder.h"

#include "google_apis/gcm/protocol/mcs.pb.h"

#include "testing/gtest/include/gtest/gtest.h"

@@ -71,10 +72,10 @@ GCMStoreImplTest::GCMStoreImplTest()

GCMStoreImplTest::~GCMStoreImplTest() {}

scoped_ptr<GCMStore> GCMStoreImplTest::BuildGCMStore() {

- return scoped_ptr<GCMStore>(new GCMStoreImpl(

- true,

- temp_directory_.path(),

- message_loop_.message_loop_proxy()));

+ GCMInternalsBuilder builder;

+ builder.SetUpForTesting();

+ return builder.BuildGCMStore(temp_directory_.path(),

+ message_loop_.message_loop_proxy()).Pass();

jianli 2014/04/09 23:36:58 No need to call Pass.

}

std::string GCMStoreImplTest::GetNextPersistentId() {

« google_apis/gcm/engine/gcm_internals_builder.cc ('K') | « google_apis/gcm/engine/gcm_store_impl.cc ('k') | google_apis/gcm/engine/mcs_client_unittest.cc » ('j') | no next file with comments »