diff options
Diffstat (limited to 'chrome/browser/sync/abstract_profile_sync_service_test.cc')
| -rw-r--r-- | chrome/browser/sync/abstract_profile_sync_service_test.cc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/chrome/browser/sync/abstract_profile_sync_service_test.cc b/chrome/browser/sync/abstract_profile_sync_service_test.cc index 02b2a05..6360ea6 100644 --- a/chrome/browser/sync/abstract_profile_sync_service_test.cc +++ b/chrome/browser/sync/abstract_profile_sync_service_test.cc @@ -94,8 +94,8 @@ AbstractProfileSyncServiceTest::AbstractProfileSyncServiceTest() : ui_thread_(BrowserThread::UI, &ui_loop_), db_thread_(BrowserThread::DB), file_thread_(BrowserThread::FILE), - io_thread_(BrowserThread::IO), - token_service_(new TokenService) {} + io_thread_(BrowserThread::IO) { +} AbstractProfileSyncServiceTest::~AbstractProfileSyncServiceTest() {} @@ -109,12 +109,6 @@ void AbstractProfileSyncServiceTest::TearDown() { // Pump messages posted by the sync core thread (which may end up // posting on the IO thread). ui_loop_.RunAllPending(); - // We need to destroy the |token_service_| here before we stop the - // |io_thread_| because it holds references to a ref-counted - // URLRequestContext. The deletion is passed to the |io_thread_| - // by scoped_refptr. If |token_service_| is destroyed after stopping - // the |io_thread_|, the deletion never happens. - token_service_.reset(NULL); io_thread_.Stop(); file_thread_.Stop(); db_thread_.Stop(); @@ -128,6 +122,12 @@ bool AbstractProfileSyncServiceTest::CreateRoot(ModelType model_type) { service_->id_factory()); } +// static +ProfileKeyedBase* AbstractProfileSyncServiceTest::BuildTokenService( + Profile* profile) { + return new TokenService; +} + CreateRootHelper::CreateRootHelper(AbstractProfileSyncServiceTest* test, ModelType model_type) : ALLOW_THIS_IN_INITIALIZER_LIST(callback_( |