| Index: chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| index f12c501ef151a72a6690c06b2c947d98b34c75ad..b2d7da901e99640ee4201581fcb8da0533744096 100644
|
| --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| @@ -117,10 +117,11 @@ void AbstractProfileSyncServiceTest::TearDown() {
|
| ui_loop_.RunAllPending();
|
| }
|
|
|
| -bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) {
|
| +bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type,
|
| + UserShare* user_share) {
|
| return ProfileSyncServiceTestHelper::CreateRoot(
|
| model_type,
|
| - service_->GetUserShare(),
|
| + user_share,
|
| service_->id_factory());
|
| }
|
|
|
| @@ -143,7 +144,7 @@ CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test,
|
| CreateRootHelper::~CreateRootHelper() {
|
| }
|
|
|
| -const base::Closure& CreateRootHelper::callback() const {
|
| +const base::Callback<void(UserShare*)>& CreateRootHelper::callback() const {
|
| return callback_;
|
| }
|
|
|
| @@ -151,6 +152,6 @@ bool CreateRootHelper::success() {
|
| return success_;
|
| }
|
|
|
| -void CreateRootHelper::CreateRootCallback() {
|
| - success_ = test_->CreateRoot(model_type_);
|
| +void CreateRootHelper::CreateRootCallback(UserShare* user_share) {
|
| + success_ = test_->CreateRoot(model_type_, user_share);
|
| }
|
|
|