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 651d86b2973153938eae17cbb0eed504e3714c95..5e73e45af9e2ce19a243fef780bc97d37d22df41 100644 |
--- a/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc |
+++ b/chrome/browser/sync/profile_sync_service_typed_url_unittest.cc |
@@ -151,8 +151,9 @@ ACTION_P6(MakeTypedUrlSyncComponents, |
class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { |
public: |
void AddTypedUrlSyncNode(const history::URLRow& url, |
- const history::VisitVector& visits) { |
- syncer::WriteTransaction trans(FROM_HERE, service_->GetUserShare()); |
+ const history::VisitVector& visits, |
+ syncer::UserShare* user_share) { |
+ syncer::WriteTransaction trans(FROM_HERE, user_share); |
syncer::ReadNode typed_url_root(&trans); |
ASSERT_EQ(syncer::BaseNode::INIT_OK, |
typed_url_root.InitByTagLookup(browser_sync::kTypedUrlTag)); |
@@ -192,7 +193,8 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { |
AbstractProfileSyncServiceTest::TearDown(); |
} |
- TypedUrlModelAssociator* StartSyncService(const base::Closure& callback) { |
+ TypedUrlModelAssociator* StartSyncService( |
+ const base::Callback<void(syncer::UserShare*)>& callback) { |
TypedUrlModelAssociator* model_associator = NULL; |
if (!service_.get()) { |
SigninManager* signin = SigninManagerFactory::GetForProfile(&profile_); |
@@ -313,14 +315,15 @@ class ProfileSyncServiceTypedUrlTest : public AbstractProfileSyncServiceTest { |
}; |
void AddTypedUrlEntries(ProfileSyncServiceTypedUrlTest* test, |
- const history::URLRows& entries) { |
- test->CreateRoot(syncer::TYPED_URLS); |
+ const history::URLRows& entries, |
+ syncer::UserShare* user_share) { |
+ test->CreateRoot(syncer::TYPED_URLS, user_share); |
for (size_t i = 0; i < entries.size(); ++i) { |
history::VisitVector visits; |
visits.push_back(history::VisitRow( |
entries[i].id(), entries[i].last_visit(), 0, |
content::PageTransitionFromInt(0), 0)); |
- test->AddTypedUrlSyncNode(entries[i], visits); |
+ test->AddTypedUrlSyncNode(entries[i], visits, user_share); |
} |
} |