| Index: chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
|
| diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
|
| index 47bad2dc846a526f614af3eed9e2b78a56bd2ac6..19bb7edcbefc76b059d89ebc96d0b72a77ef9df2 100644
|
| --- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
|
| +++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
|
| @@ -2,7 +2,12 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "base/files/file_util.h"
|
| +#include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
|
| +
|
| +#include <string>
|
| +#include <vector>
|
| +
|
| +#include "base/file_util.h"
|
| #include "base/prefs/scoped_user_pref_update.h"
|
| #include "base/prefs/testing_pref_service.h"
|
| #include "base/strings/string_util.h"
|
| @@ -12,7 +17,6 @@
|
| #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
|
| #include "chrome/browser/chromeos/profiles/profile_helper.h"
|
| #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
|
| -#include "chrome/browser/extensions/extension_garbage_collector_chromeos.h"
|
| #include "chrome/browser/extensions/extension_service.h"
|
| #include "chrome/browser/extensions/extension_service_test_base.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| @@ -23,6 +27,7 @@
|
| #include "components/user_manager/user_manager.h"
|
| #include "content/public/browser/browser_thread.h"
|
| #include "content/public/browser/plugin_service.h"
|
| +#include "content/public/test/test_utils.h"
|
| #include "extensions/browser/extension_prefs.h"
|
| #include "extensions/browser/install_flag.h"
|
| #include "extensions/common/manifest_constants.h"
|
| @@ -79,7 +84,7 @@ class ExtensionGarbageCollectorChromeOSUnitTest
|
| ExtensionGarbageCollector::Get(profile_.get())
|
| ->GarbageCollectExtensionsForTest();
|
| // Wait for GarbageCollectExtensions task to complete.
|
| - content::BrowserThread::GetBlockingPool()->FlushForTesting();
|
| + content::RunAllBlockingPoolTasksUntilIdle();
|
| }
|
|
|
| base::FilePath CreateSharedExtensionDir(const std::string& id,
|
|
|