| Index: extensions/common/manifest_handlers/sandboxed_page_info.cc
|
| diff --git a/extensions/common/manifest_handlers/sandboxed_page_info.cc b/extensions/common/manifest_handlers/sandboxed_page_info.cc
|
| index d430a8adcb98bd4fea89de4c74143d2385834176..2471e93467d7699f429e37322dd4ec8a1c15bf99 100644
|
| --- a/extensions/common/manifest_handlers/sandboxed_page_info.cc
|
| +++ b/extensions/common/manifest_handlers/sandboxed_page_info.cc
|
| @@ -66,7 +66,7 @@ bool SandboxedPageHandler::Parse(Extension* extension, base::string16* error) {
|
|
|
| const base::ListValue* list_value = NULL;
|
| if (!extension->manifest()->GetList(keys::kSandboxedPages, &list_value)) {
|
| - *error = ASCIIToUTF16(errors::kInvalidSandboxedPagesList);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidSandboxedPagesList);
|
| return false;
|
| }
|
|
|
| @@ -93,7 +93,7 @@ bool SandboxedPageHandler::Parse(Extension* extension, base::string16* error) {
|
| if (!extension->manifest()->GetString(
|
| keys::kSandboxedPagesCSP,
|
| &sandboxed_info->content_security_policy)) {
|
| - *error = ASCIIToUTF16(errors::kInvalidSandboxedPagesCSP);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidSandboxedPagesCSP);
|
| return false;
|
| }
|
|
|
| @@ -101,7 +101,7 @@ bool SandboxedPageHandler::Parse(Extension* extension, base::string16* error) {
|
| sandboxed_info->content_security_policy) ||
|
| !csp_validator::ContentSecurityPolicyIsSandboxed(
|
| sandboxed_info->content_security_policy, extension->GetType())) {
|
| - *error = ASCIIToUTF16(errors::kInvalidSandboxedPagesCSP);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidSandboxedPagesCSP);
|
| return false;
|
| }
|
| } else {
|
|
|