| Index: extensions/browser/api/storage/storage_frontend_unittest.cc
|
| diff --git a/extensions/browser/api/storage/storage_frontend_unittest.cc b/extensions/browser/api/storage/storage_frontend_unittest.cc
|
| index ec47409774baa6d5c691bb54f8864601592424e2..dc926ab2e17b12d899c8380c076d1609da9a460a 100644
|
| --- a/extensions/browser/api/storage/storage_frontend_unittest.cc
|
| +++ b/extensions/browser/api/storage/storage_frontend_unittest.cc
|
| @@ -9,11 +9,11 @@
|
| #include "base/bind.h"
|
| #include "base/files/file_util.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| -#include "base/run_loop.h"
|
| #include "base/strings/string_number_conversions.h"
|
| #include "content/public/browser/browser_context.h"
|
| #include "content/public/test/test_browser_context.h"
|
| #include "content/public/test/test_browser_thread_bundle.h"
|
| +#include "content/public/test/test_utils.h"
|
| #include "extensions/browser/api/extensions_api_client.h"
|
| #include "extensions/browser/api/storage/settings_namespace.h"
|
| #include "extensions/browser/api/storage/settings_test_util.h"
|
| @@ -52,7 +52,7 @@ class ExtensionSettingsFrontendTest : public ExtensionsTest {
|
| void TearDown() override {
|
| frontend_.reset();
|
| // Execute any pending deletion tasks.
|
| - base::RunLoop().RunUntilIdle();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
| ExtensionsTest::TearDown();
|
| }
|
|
|
| @@ -133,7 +133,7 @@ TEST_F(ExtensionSettingsFrontendTest, SettingsClearedOnUninstall) {
|
|
|
| // This would be triggered by extension uninstall via a DataDeleter.
|
| frontend_->DeleteStorageSoon(id);
|
| - base::RunLoop().RunUntilIdle();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
|
|
| // The storage area may no longer be valid post-uninstall, so re-request.
|
| storage = util::GetStorage(extension, settings::LOCAL, frontend_.get());
|
| @@ -168,7 +168,7 @@ TEST_F(ExtensionSettingsFrontendTest, LeveldbDatabaseDeletedFromDiskOnClear) {
|
| }
|
|
|
| frontend_.reset();
|
| - base::RunLoop().RunUntilIdle();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
| // TODO(kalman): Figure out why this fails, despite appearing to work.
|
| // Leaving this commented out rather than disabling the whole test so that the
|
| // deletion code paths are at least exercised.
|
|
|