| Index: chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
|
| diff --git a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
|
| index 73babc4d99342c109231b4ec97e8977dfe394464..93d200e272b7f578b1229b0a7b0c5d87ba1d8afe 100644
|
| --- a/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
|
| +++ b/chrome/browser/sync/glue/bookmark_data_type_controller_unittest.cc
|
| @@ -57,7 +57,9 @@ class HistoryMock : public HistoryService {
|
| KeyedService* BuildBookmarkModel(content::BrowserContext* context) {
|
| Profile* profile = static_cast<Profile*>(context);
|
| BookmarkModel* bookmark_model = new BookmarkModel(profile);
|
| - bookmark_model->Load(profile->GetIOTaskRunner());
|
| + bookmark_model->Load(profile->GetIOTaskRunner(),
|
| + content::BrowserThread::GetMessageLoopProxyForThread(
|
| + content::BrowserThread::UI));
|
| return bookmark_model;
|
| }
|
|
|
| @@ -180,7 +182,9 @@ TEST_F(SyncBookmarkDataTypeControllerTest, StartBookmarkModelNotReady) {
|
| base::Unretained(&model_load_callback_)));
|
| EXPECT_EQ(DataTypeController::MODEL_STARTING, bookmark_dtc_->state());
|
|
|
| - bookmark_model_->Load(profile_.GetIOTaskRunner());
|
| + bookmark_model_->Load(profile_.GetIOTaskRunner(),
|
| + content::BrowserThread::GetMessageLoopProxyForThread(
|
| + content::BrowserThread::UI));
|
| test::WaitForBookmarkModelToLoad(bookmark_model_);
|
| EXPECT_EQ(DataTypeController::MODEL_LOADED, bookmark_dtc_->state());
|
|
|
|
|