| Index: extensions/common/permissions/manifest_permission_set.cc
|
| diff --git a/extensions/common/permissions/manifest_permission_set.cc b/extensions/common/permissions/manifest_permission_set.cc
|
| index 821159f6a2591fa54261a9dae296fb801857dd40..fecb611dbe16ea7a2ef729b86aceddeebde86f8d 100644
|
| --- a/extensions/common/permissions/manifest_permission_set.cc
|
| +++ b/extensions/common/permissions/manifest_permission_set.cc
|
| @@ -24,7 +24,7 @@ bool CreateManifestPermission(
|
| const std::string& permission_name,
|
| const base::Value* permission_value,
|
| ManifestPermissionSet* manifest_permissions,
|
| - string16* error,
|
| + base::string16* error,
|
| std::vector<std::string>* unhandled_permissions) {
|
|
|
| scoped_ptr<ManifestPermission> permission(
|
| @@ -60,7 +60,7 @@ namespace extensions {
|
| bool ManifestPermissionSet::ParseFromJSON(
|
| const base::ListValue* permissions,
|
| ManifestPermissionSet* manifest_permissions,
|
| - string16* error,
|
| + base::string16* error,
|
| std::vector<std::string>* unhandled_permissions) {
|
| for (size_t i = 0; i < permissions->GetSize(); ++i) {
|
| std::string permission_name;
|
|
|