chrome/browser/sync/profile_sync_service_typed_url_unittest.cc - Issue 60733019: This is the third CL of several that will eventually replace TokenService with

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_typed_url_unittest.cc

Issue 60733019: This is the third CL of several that will eventually replace TokenService with (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

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

Index: chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

diff --git a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

index eabe26697d5b3c6679e1b13ad58345afcb31c02f..4d78985266293439ca16794f228ea0dfda62d123 100644

--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc

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

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

#include "chrome/browser/signin/signin_manager.h"

#include "chrome/browser/signin/signin_manager_factory.h"

-#include "chrome/browser/signin/token_service_factory.h"

#include "chrome/browser/sync/abstract_profile_sync_service_test.h"

#include "chrome/browser/sync/fake_oauth2_token_service.h"

#include "chrome/browser/sync/glue/data_type_error_handler_mock.h"

@@ -214,9 +213,6 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

SigninManagerBase* signin =

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

signin->SetAuthenticatedUsername("test");

- token_service_ = static_cast<TokenService*>(

- TokenServiceFactory::GetInstance()->SetTestingFactoryAndUse(

- profile_.get(), BuildTokenService));

sync_service_ = static_cast<TestProfileSyncService*>(

ProfileSyncServiceFactory::GetInstance()->SetTestingFactoryAndUse(

profile_.get(),

« no previous file with comments | « chrome/browser/sync/profile_sync_service_startup_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | no next file with comments »