| 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 bac79ef70928f609814a194c00fa474945188507..8eb7aa43274f701938779b403a4e89088164b97a 100644
|
| --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc
|
| @@ -40,7 +40,7 @@ syncer::ImmutableChangeRecordList
|
| return syncer::ImmutableChangeRecordList(&records);
|
| }
|
|
|
| -AbstractProfileSyncServiceTest::AbstractProfileSyncServiceTest()
|
| +BaseProfileSyncServiceTest::BaseProfileSyncServiceTest()
|
| : ui_thread_(BrowserThread::UI, &ui_loop_),
|
| db_thread_(BrowserThread::DB),
|
| file_thread_(BrowserThread::FILE),
|
| @@ -49,15 +49,15 @@ AbstractProfileSyncServiceTest::AbstractProfileSyncServiceTest()
|
| sync_service_(NULL) {
|
| }
|
|
|
| -AbstractProfileSyncServiceTest::~AbstractProfileSyncServiceTest() {}
|
| +BaseProfileSyncServiceTest::~BaseProfileSyncServiceTest() {}
|
|
|
| -void AbstractProfileSyncServiceTest::SetUp() {
|
| +void BaseProfileSyncServiceTest::SetUp() {
|
| db_thread_.Start();
|
| file_thread_.Start();
|
| io_thread_.StartIOThread();
|
| }
|
|
|
| -void AbstractProfileSyncServiceTest::TearDown() {
|
| +void BaseProfileSyncServiceTest::TearDown() {
|
| // Pump messages posted by the sync core thread (which may end up
|
| // posting on the IO thread).
|
| ui_loop_.RunUntilIdle();
|
| @@ -67,18 +67,31 @@ void AbstractProfileSyncServiceTest::TearDown() {
|
| ui_loop_.RunUntilIdle();
|
| }
|
|
|
| -bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) {
|
| +bool BaseProfileSyncServiceTest::CreateRoot(ModelType model_type) {
|
| return syncer::TestUserShare::CreateRoot(model_type,
|
| sync_service_->GetUserShare());
|
| }
|
|
|
| // static
|
| -ProfileKeyedService* AbstractProfileSyncServiceTest::BuildTokenService(
|
| +ProfileKeyedService* BaseProfileSyncServiceTest::BuildTokenService(
|
| Profile* profile) {
|
| return new TokenService;
|
| }
|
|
|
| -CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test,
|
| +AbstractProfileSyncServiceTest::AbstractProfileSyncServiceTest()
|
| + : BaseProfileSyncServiceTest() {}
|
| +
|
| +AbstractProfileSyncServiceTest::~AbstractProfileSyncServiceTest() {}
|
| +
|
| +void AbstractProfileSyncServiceTest::SetUp() {
|
| + BaseProfileSyncServiceTest::SetUp();
|
| +}
|
| +
|
| +void AbstractProfileSyncServiceTest::TearDown() {
|
| + BaseProfileSyncServiceTest::TearDown();
|
| +}
|
| +
|
| +CreateRootHelper::CreateRootHelper(BaseProfileSyncServiceTest* test,
|
| ModelType model_type)
|
| : ALLOW_THIS_IN_INITIALIZER_LIST(callback_(
|
| base::Bind(&CreateRootHelper::CreateRootCallback,
|
|
|