| Index: chrome/browser/extensions/standard_management_policy_provider.cc
|
| diff --git a/chrome/browser/extensions/standard_management_policy_provider.cc b/chrome/browser/extensions/standard_management_policy_provider.cc
|
| index 05e2e5fc9abdc0d4ad3c581d8486d6dd8045ee54..1a818f2c8260a565200696cb54d84dcf52d687c6 100644
|
| --- a/chrome/browser/extensions/standard_management_policy_provider.cc
|
| +++ b/chrome/browser/extensions/standard_management_policy_provider.cc
|
| @@ -14,8 +14,8 @@
|
| namespace extensions {
|
|
|
| StandardManagementPolicyProvider::StandardManagementPolicyProvider(
|
| - ExtensionPrefs* prefs, Blacklist* blacklist)
|
| - : prefs_(prefs), blacklist_(blacklist) {
|
| + ExtensionPrefs* prefs)
|
| + : prefs_(prefs) {
|
| }
|
|
|
| StandardManagementPolicyProvider::~StandardManagementPolicyProvider() {
|
| @@ -34,15 +34,14 @@ std::string
|
| bool StandardManagementPolicyProvider::UserMayLoad(
|
| const Extension* extension,
|
| string16* error) const {
|
| - bool is_google_blacklisted = blacklist_->IsBlacklisted(extension);
|
| const base::ListValue* blacklist =
|
| prefs_->pref_service()->GetList(prefs::kExtensionInstallDenyList);
|
| const base::ListValue* whitelist =
|
| prefs_->pref_service()->GetList(prefs::kExtensionInstallAllowList);
|
| const base::ListValue* forcelist =
|
| prefs_->pref_service()->GetList(prefs::kExtensionInstallForceList);
|
| - return admin_policy::UserMayLoad(is_google_blacklisted, blacklist, whitelist,
|
| - forcelist, extension, error);
|
| + return admin_policy::UserMayLoad(
|
| + blacklist, whitelist, forcelist, extension, error);
|
| }
|
|
|
| bool StandardManagementPolicyProvider::UserMayModifySettings(
|
|
|