| Index: chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
|
| diff --git a/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc b/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
|
| index 70a8917e76d6f64120bb827b2dc26896e512478f..74a0864eb8543f07004ad32c2cb85dba7469edcb 100644
|
| --- a/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
|
| +++ b/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
|
| @@ -74,7 +74,7 @@ bool LoadFileHandler(const std::string& handler_id,
|
|
|
| if (handler_info.HasKey(keys::kFileHandlerTitle) &&
|
| !handler_info.GetString(keys::kFileHandlerTitle, &handler.title)) {
|
| - *error = ASCIIToUTF16(errors::kInvalidFileHandlerTitle);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidFileHandlerTitle);
|
| return false;
|
| }
|
|
|
| @@ -115,7 +115,7 @@ bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {
|
| const base::DictionaryValue* all_handlers = NULL;
|
| if (!extension->manifest()->GetDictionary(keys::kFileHandlers,
|
| &all_handlers)) {
|
| - *error = ASCIIToUTF16(errors::kInvalidFileHandlers);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidFileHandlers);
|
| return false;
|
| }
|
|
|
| @@ -129,7 +129,7 @@ bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {
|
| if (!LoadFileHandler(iter.key(), *handler, &info->file_handlers, error))
|
| return false;
|
| } else {
|
| - *error = ASCIIToUTF16(errors::kInvalidFileHandlers);
|
| + *error = base::ASCIIToUTF16(errors::kInvalidFileHandlers);
|
| return false;
|
| }
|
| }
|
| @@ -144,7 +144,7 @@ bool FileHandlersParser::Parse(Extension* extension, base::string16* error) {
|
| }
|
|
|
| if (filterCount > kMaxTypeAndExtensionHandlers) {
|
| - *error = ASCIIToUTF16(
|
| + *error = base::ASCIIToUTF16(
|
| errors::kInvalidFileHandlersTooManyTypesAndExtensions);
|
| return false;
|
| }
|
|
|