| Index: chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| diff --git a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| index cd8a320fc168c7c33bfdf6d11963847ce49e25e1..87abc1547edcf4d346142483c67eeba0328eacf6 100644
|
| --- a/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| +++ b/chrome/browser/ui/toolbar/recent_tabs_sub_menu_model_unittest.cc
|
| @@ -4,13 +4,16 @@
|
|
|
| #include "chrome/browser/ui/toolbar/recent_tabs_sub_menu_model.h"
|
|
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| #include "base/command_line.h"
|
| #include "base/run_loop.h"
|
| #include "chrome/app/chrome_command_ids.h"
|
| +#include "chrome/browser/sessions/persistent_tab_restore_service.h"
|
| #include "chrome/browser/sessions/session_service.h"
|
| #include "chrome/browser/sessions/session_service_factory.h"
|
| #include "chrome/browser/sessions/session_types.h"
|
| -#include "chrome/browser/sessions/persistent_tab_restore_service.h"
|
| #include "chrome/browser/sessions/tab_restore_service_factory.h"
|
| #include "chrome/browser/sync/glue/local_device_info_provider_mock.h"
|
| #include "chrome/browser/sync/glue/synced_session.h"
|
| @@ -26,6 +29,8 @@
|
| #include "chrome/test/base/testing_profile.h"
|
| #include "components/sessions/serialized_navigation_entry_test_helper.h"
|
| #include "content/public/browser/browser_thread.h"
|
| +#include "content/public/test/test_utils.h"
|
| +#include "grit/generated_resources.h"
|
| #include "sync/api/fake_sync_change_processor.h"
|
| #include "sync/api/sync_error_factory_mock.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
| @@ -135,9 +140,7 @@ class RecentTabsSubMenuModelTest
|
| }
|
|
|
| void WaitForLoadFromLastSession() {
|
| - content::BrowserThread::GetBlockingPool()->FlushForTesting();
|
| - base::RunLoop().RunUntilIdle();
|
| - content::BrowserThread::GetBlockingPool()->FlushForTesting();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
| }
|
|
|
| static KeyedService* GetTabRestoreService(
|
| @@ -282,7 +285,7 @@ TEST_F(RecentTabsSubMenuModelTest,
|
| TabRestoreServiceFactory::GetInstance()->SetTestingFactory(
|
| profile(), RecentTabsSubMenuModelTest::GetTabRestoreService);
|
| // Let the shutdown of previous TabRestoreService run.
|
| - content::BrowserThread::GetBlockingPool()->FlushForTesting();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
|
|
| TestRecentTabsSubMenuModel model(NULL, browser(), NULL);
|
| TestRecentTabsMenuModelDelegate delegate(&model);
|
|
|