chrome/browser/invalidation/ticl_invalidation_service_unittest.cc - Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes

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/invalidation/ticl_invalidation_service_unittest.cc

Issue 23382008: Making OAuth2TokenService multi-login aware, updating callers, minor fixes (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing to include the update to ProfileSyncService: r224220 Created 7 years, 3 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/invalidation/ticl_invalidation_service.cc ('k') | chrome/browser/local_discovery/cloud_print_base_api_flow.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

diff --git a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

index 314e8a70f3d1450b2fba5425490500e4cc02d9c6..64379ece0c2367f196cd4e054b7711692a305131 100644

--- a/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

+++ b/chrome/browser/invalidation/ticl_invalidation_service_unittest.cc

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

#include "chrome/browser/invalidation/invalidation_service_factory.h"

#include "chrome/browser/invalidation/invalidation_service_test_template.h"

+#include "chrome/browser/signin/fake_profile_oauth2_token_service.h"

#include "chrome/test/base/testing_profile.h"

#include "sync/notifier/fake_invalidation_handler.h"

#include "sync/notifier/fake_invalidator.h"

@@ -25,8 +26,11 @@ class TiclInvalidationServiceTestDelegate {

void CreateInvalidationService() {

fake_invalidator_ = new syncer::FakeInvalidator();

profile_.reset(new TestingProfile());

+ token_service_.reset(new FakeProfileOAuth2TokenService);

invalidation_service_.reset(

- new TiclInvalidationService(NULL, NULL, NULL, profile_.get()));

+ new TiclInvalidationService(NULL,

+ token_service_.get(),

+ profile_.get()));

invalidation_service_->InitForTest(fake_invalidator_);

}

@@ -50,6 +54,7 @@ class TiclInvalidationServiceTestDelegate {

syncer::FakeInvalidator* fake_invalidator_; // owned by the service.

scoped_ptr<TiclInvalidationService> invalidation_service_;

scoped_ptr<TestingProfile> profile_;

+ scoped_ptr<FakeProfileOAuth2TokenService> token_service_;

};

INSTANTIATE_TYPED_TEST_CASE_P(