chrome/browser/sync/profile_sync_service_typed_url_unittest.cc - Issue 183803026: Clean up InvalidationService test infrastructure.

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 183803026: Clean up InvalidationService test infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 6 years, 9 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_session_unittest.cc ('k') | chrome/browser/sync/profile_sync_service_unittest.cc » ('j') | chrome/chrome_tests_unit.gypi » ('J')
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 845a26197a3d62fd0336697dea7e21c320b4a9f2..c8c988dc2ef259d03a5b0b27214990a798cda634 100644

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

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

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

#include "chrome/browser/history/history_service.h"

#include "chrome/browser/history/history_service_factory.h"

#include "chrome/browser/history/history_types.h"

+#include "chrome/browser/invalidation/fake_invalidation_service.h"

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

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

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

@@ -52,8 +53,8 @@

#include "testing/gmock/include/gmock/gmock.h"

#include "url/gurl.h"

-using base::Time;

using base::Thread;

+using base::Time;

using browser_sync::TypedUrlChangeProcessor;

using browser_sync::TypedUrlDataTypeController;

using browser_sync::TypedUrlModelAssociator;

@@ -61,10 +62,10 @@ using history::HistoryBackend;

using history::URLID;

using history::URLRow;

using syncer::syncable::WriteTransaction;

-using testing::_;

using testing::DoAll;

using testing::Return;

using testing::SetArgumentPointee;

+using testing::_;

namespace {

// Visits with this timestamp are treated as expired.

@@ -191,8 +192,8 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest {

ProfileOAuth2TokenServiceFactory::GetInstance(),

FakeProfileOAuth2TokenServiceWrapper::BuildAutoIssuingTokenService);

profile_ = builder.Build().Pass();

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

- SetBuildOnlyFakeInvalidatorsForTest(true);

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

+ profile_.get(), invalidation::FakeInvalidationService::Build);

history_backend_ = new HistoryBackendMock();

history_service_ = static_cast<HistoryServiceMock*>(

HistoryServiceFactory::GetInstance()->SetTestingFactoryAndUse(