| Index: chrome/browser/extensions/permissions_based_management_policy_provider_unittest.cc
|
| diff --git a/chrome/browser/extensions/permissions_based_management_policy_provider_unittest.cc b/chrome/browser/extensions/permissions_based_management_policy_provider_unittest.cc
|
| index 5651c8db80286674ab3cd233b2853f8f6650cf0a..c678aca6cc7a018a3db21bf7d80a95b98fc6e8ef 100644
|
| --- a/chrome/browser/extensions/permissions_based_management_policy_provider_unittest.cc
|
| +++ b/chrome/browser/extensions/permissions_based_management_policy_provider_unittest.cc
|
| @@ -15,8 +15,9 @@
|
| #include "chrome/browser/extensions/extension_management.h"
|
| #include "chrome/browser/extensions/extension_management_test_util.h"
|
| #include "chrome/common/extensions/permissions/chrome_api_permissions.h"
|
| -#include "components/prefs/pref_registry_simple.h"
|
| -#include "components/prefs/testing_pref_service.h"
|
| +#include "chrome/test/base/testing_profile.h"
|
| +#include "components/sync_preferences/testing_pref_service_syncable.h"
|
| +#include "content/public/test/test_browser_thread_bundle.h"
|
| #include "extensions/common/extension.h"
|
| #include "extensions/common/manifest.h"
|
| #include "extensions/common/manifest_constants.h"
|
| @@ -26,23 +27,21 @@
|
| namespace extensions {
|
|
|
| class PermissionsBasedManagementPolicyProviderTest : public testing::Test {
|
| - public:
|
| - typedef ExtensionManagementPrefUpdater<TestingPrefServiceSimple> PrefUpdater;
|
| + protected:
|
| + using PrefUpdater = ExtensionManagementPrefUpdater<
|
| + sync_preferences::TestingPrefServiceSyncable>;
|
|
|
| PermissionsBasedManagementPolicyProviderTest()
|
| - : pref_service_(new TestingPrefServiceSimple()),
|
| - settings_(new ExtensionManagement(pref_service_.get())),
|
| + : profile_(base::MakeUnique<TestingProfile>()),
|
| + settings_(base::MakeUnique<ExtensionManagement>(profile_.get())),
|
| + pref_service_(profile_->GetTestingPrefService()),
|
| provider_(settings_.get()) {}
|
|
|
| void SetUp() override {
|
| ChromeAPIPermissions api_permissions;
|
| perm_list_ = api_permissions.GetAllPermissions();
|
| - pref_service_->registry()->RegisterDictionaryPref(
|
| - pref_names::kExtensionManagement);
|
| }
|
|
|
| - void TearDown() override {}
|
| -
|
| // Get API permissions name for |id|, we cannot use arbitrary strings since
|
| // they will be ignored by ExtensionManagementService.
|
| std::string GetAPIPermissionName(APIPermission::ID id) {
|
| @@ -79,10 +78,12 @@ class PermissionsBasedManagementPolicyProviderTest : public testing::Test {
|
| }
|
|
|
| protected:
|
| + content::TestBrowserThreadBundle thread_bundle_;
|
| std::vector<std::unique_ptr<APIPermissionInfo>> perm_list_;
|
|
|
| - std::unique_ptr<TestingPrefServiceSimple> pref_service_;
|
| + std::unique_ptr<TestingProfile> profile_;
|
| std::unique_ptr<ExtensionManagement> settings_;
|
| + sync_preferences::TestingPrefServiceSyncable* pref_service_ = nullptr;
|
|
|
| PermissionsBasedManagementPolicyProvider provider_;
|
| };
|
| @@ -112,7 +113,7 @@ TEST_F(PermissionsBasedManagementPolicyProviderTest, APIPermissions) {
|
|
|
| // Blocks kProxy by default. The test extension should still be allowed.
|
| {
|
| - PrefUpdater pref(pref_service_.get());
|
| + PrefUpdater pref(pref_service_);
|
| pref.AddBlockedPermission("*",
|
| GetAPIPermissionName(APIPermission::kProxy));
|
| }
|
| @@ -122,7 +123,7 @@ TEST_F(PermissionsBasedManagementPolicyProviderTest, APIPermissions) {
|
|
|
| // Blocks kCookie this time. The test extension should not be allowed now.
|
| {
|
| - PrefUpdater pref(pref_service_.get());
|
| + PrefUpdater pref(pref_service_);
|
| pref.AddBlockedPermission("*",
|
| GetAPIPermissionName(APIPermission::kCookie));
|
| }
|
| @@ -132,7 +133,7 @@ TEST_F(PermissionsBasedManagementPolicyProviderTest, APIPermissions) {
|
|
|
| // Explictly allows kCookie for test extension. It should be allowed again.
|
| {
|
| - PrefUpdater pref(pref_service_.get());
|
| + PrefUpdater pref(pref_service_);
|
| pref.AddAllowedPermission(extension->id(),
|
| GetAPIPermissionName(APIPermission::kCookie));
|
| }
|
| @@ -142,7 +143,7 @@ TEST_F(PermissionsBasedManagementPolicyProviderTest, APIPermissions) {
|
|
|
| // Explictly blocks kCookie for test extension. It should be blocked again.
|
| {
|
| - PrefUpdater pref(pref_service_.get());
|
| + PrefUpdater pref(pref_service_);
|
| pref.AddBlockedPermission(extension->id(),
|
| GetAPIPermissionName(APIPermission::kCookie));
|
| }
|
| @@ -152,7 +153,7 @@ TEST_F(PermissionsBasedManagementPolicyProviderTest, APIPermissions) {
|
|
|
| // Blocks kDownloads by default. It should be blocked.
|
| {
|
| - PrefUpdater pref(pref_service_.get());
|
| + PrefUpdater pref(pref_service_);
|
| pref.UnsetBlockedPermissions(extension->id());
|
| pref.UnsetAllowedPermissions(extension->id());
|
| pref.ClearBlockedPermissions("*");
|
|
|