chrome/browser/sync/profile_sync_service_password_unittest.cc - Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService""

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

Issue 17911005: Merge 208347 "Revert 208315 "Make use of InvalidationService"" (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1547/src/

Patch Set: Created 7 years, 6 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/sync/profile_sync_service_observer.cc ('k') | chrome/browser/sync/profile_sync_service_preference_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_password_unittest.cc

===================================================================

--- chrome/browser/sync/profile_sync_service_password_unittest.cc (revision 208727)

+++ chrome/browser/sync/profile_sync_service_password_unittest.cc (working copy)

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

#include "base/synchronization/waitable_event.h"

#include "base/test/test_timeouts.h"

#include "base/time.h"

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

#include "chrome/browser/password_manager/mock_password_store.h"

#include "chrome/browser/password_manager/password_store.h"

#include "chrome/browser/password_manager/password_store_factory.h"

@@ -156,8 +155,6 @@

AbstractProfileSyncServiceTest::SetUp();

profile_.reset(new ProfileMock);

profile_->CreateRequestContext();

- invalidation::InvalidationServiceFactory::GetInstance()->

- SetBuildOnlyFakeInvalidatorsForTest(true);

password_store_ = static_cast<MockPasswordStore*>(

PasswordStoreFactory::GetInstance()->SetTestingFactoryAndUse(

profile_.get(), MockPasswordStore::Build).get());

@@ -190,7 +187,7 @@

if (!sync_service_) {

SigninManagerBase* signin =

SigninManagerFactory::GetForProfile(profile_.get());

- signin->SetAuthenticatedUsername("test_user@gmail.com");

+ signin->SetAuthenticatedUsername("test_user");

token_service_ = static_cast<TokenService*>(

TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse(

profile_.get(), BuildTokenService));