chrome/browser/sync/profile_sync_service_unittest.cc - Issue 10804039: Make SyncBackendRegistrar aware of loaded data

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

Issue 10804039: Make SyncBackendRegistrar aware of loaded data (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 5 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

« chrome/browser/sync/glue/sync_backend_registrar.cc ('K') | « chrome/browser/sync/profile_sync_service_typed_url_unittest.cc ('k') | chrome/browser/sync/test_profile_sync_service.h » ('j') | chrome/browser/sync/test_profile_sync_service.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/profile_sync_service_unittest.cc

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

index a6f692f2d3f7250d7b279389de7db3ccbd9d05c7..01d622a046c3793aebe36320a8f5d53d4583d0b7 100644

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

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

@@ -104,7 +104,7 @@ class ProfileSyncServiceTest : public testing::Test {

signin,

ProfileSyncService::AUTO_START,

true,

- base::Closure()));

+ TestProfileSyncService::NullCallback()));

if (!set_initial_sync_ended)

service_->dont_set_initial_sync_ended_on_init();

if (synchronous_sync_configuration)

@@ -160,7 +160,7 @@ TEST_F(ProfileSyncServiceTest, InitialState) {

signin,

ProfileSyncService::MANUAL_START,

true,

- base::Closure()));

+ TestProfileSyncService::NullCallback()));

EXPECT_TRUE(

service_->sync_service_url().spec() ==

ProfileSyncService::kSyncServerUrl ||

@@ -179,7 +179,7 @@ TEST_F(ProfileSyncServiceTest, DisabledByPolicy) {

signin,

ProfileSyncService::MANUAL_START,

true,

- base::Closure()));

+ TestProfileSyncService::NullCallback()));

service_->Initialize();

EXPECT_TRUE(service_->IsManaged());

}

@@ -195,7 +195,7 @@ TEST_F(ProfileSyncServiceTest, AbortedByShutdown) {

signin,

ProfileSyncService::AUTO_START,

true,

- base::Closure()));

+ TestProfileSyncService::NullCallback()));

EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).Times(0);

EXPECT_CALL(*factory, CreateBookmarkSyncComponents(_, _)).

Times(0);

@@ -219,7 +219,7 @@ TEST_F(ProfileSyncServiceTest, DisableAndEnableSyncTemporarily) {

signin,

ProfileSyncService::AUTO_START,

true,

- base::Closure()));

+ TestProfileSyncService::NullCallback()));

// Register the bookmark data type.

EXPECT_CALL(*factory, CreateDataTypeManager(_, _)).

WillRepeatedly(ReturnNewDataTypeManager());