| Index: extensions/browser/test_management_policy.cc
|
| diff --git a/extensions/browser/test_management_policy.cc b/extensions/browser/test_management_policy.cc
|
| index a2c5404dd4054429d60eb01ffe2780a1e7f9370a..5c78efe6b2a475e62325d2ef74c1ec7c28826df8 100644
|
| --- a/extensions/browser/test_management_policy.cc
|
| +++ b/extensions/browser/test_management_policy.cc
|
| @@ -41,21 +41,22 @@ std::string TestManagementPolicyProvider::GetDebugPolicyProviderName() const {
|
| }
|
|
|
| bool TestManagementPolicyProvider::UserMayLoad(const Extension* extension,
|
| - string16* error) const {
|
| + base::string16* error) const {
|
| if (error && !may_load_)
|
| *error = error_message_;
|
| return may_load_;
|
| }
|
|
|
| bool TestManagementPolicyProvider::UserMayModifySettings(
|
| - const Extension* extension, string16* error) const {
|
| + const Extension* extension, base::string16* error) const {
|
| if (error && !may_modify_status_)
|
| *error = error_message_;
|
| return may_modify_status_;
|
| }
|
|
|
| bool TestManagementPolicyProvider::MustRemainEnabled(const Extension* extension,
|
| - string16* error) const {
|
| + base::string16* error)
|
| + const {
|
| if (error && must_remain_enabled_)
|
| *error = error_message_;
|
| return must_remain_enabled_;
|
| @@ -64,7 +65,7 @@ bool TestManagementPolicyProvider::MustRemainEnabled(const Extension* extension,
|
| bool TestManagementPolicyProvider::MustRemainDisabled(
|
| const Extension* extension,
|
| Extension::DisableReason* reason,
|
| - string16* error) const {
|
| + base::string16* error) const {
|
| if (must_remain_disabled_) {
|
| if (error)
|
| *error = error_message_;
|
|
|