Rename extension_manifest_keys namespace to extensions::manifest_keys.

chrome/common/extensions/api/file_handlers/file_handlers_parser.cc

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 78469f6d7a6aaa1220cadfe3e398a4720ee8bede..be8b8585e0f3ac6075381f6325785a78834abbee 100644
--- a/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
+++ b/chrome/common/extensions/api/file_handlers/file_handlers_parser.cc
@@ -12,7 +12,8 @@
 #include "chrome/common/extensions/manifest.h"
 #include "extensions/common/error_utils.h"
 
-namespace keys = extension_manifest_keys;
+namespace keys = extensions::manifest_keys;
+namespace errors = extension_manifest_errors;
 
 namespace extensions {
 
@@ -26,7 +27,7 @@ FileHandlers::~FileHandlers() {}
 const std::vector<FileHandlerInfo>* FileHandlers::GetFileHandlers(
     const Extension* extension) {
   FileHandlers* info = static_cast<FileHandlers*>(
-      extension->GetManifestData(extension_manifest_keys::kFileHandlers));
+      extension->GetManifestData(keys::kFileHandlers));
   return info ? &info->file_handlers : NULL;
 }
 
@@ -49,7 +50,7 @@ bool LoadFileHandler(const std::string& handler_id,
   if (handler_info.HasKey(keys::kFileHandlerTypes) &&
       !handler_info.GetList(keys::kFileHandlerTypes, &mime_types)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
-        extension_manifest_errors::kInvalidFileHandlerType, handler_id);
+        errors::kInvalidFileHandlerType, handler_id);
     return false;
   }
 
@@ -57,21 +58,21 @@ bool LoadFileHandler(const std::string& handler_id,
   if (handler_info.HasKey(keys::kFileHandlerExtensions) &&
       !handler_info.GetList(keys::kFileHandlerExtensions, &file_extensions)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
-        extension_manifest_errors::kInvalidFileHandlerExtension, handler_id);
+        errors::kInvalidFileHandlerExtension, handler_id);
     return false;
   }
 
   if ((!mime_types || mime_types->GetSize() == 0) &&
       (!file_extensions || file_extensions->GetSize() == 0)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
-        extension_manifest_errors::kInvalidFileHandlerNoTypeOrExtension,
+        errors::kInvalidFileHandlerNoTypeOrExtension,
         handler_id);
     return false;
   }
 
   if (handler_info.HasKey(keys::kFileHandlerTitle) &&
       !handler_info.GetString(keys::kFileHandlerTitle, &handler.title)) {
-    *error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlerTitle);
+    *error = ASCIIToUTF16(errors::kInvalidFileHandlerTitle);
     return false;
   }
 
@@ -80,7 +81,7 @@ bool LoadFileHandler(const std::string& handler_id,
     for (size_t i = 0; i < mime_types->GetSize(); ++i) {
       if (!mime_types->GetString(i, &type)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            extension_manifest_errors::kInvalidFileHandlerTypeElement,
+            errors::kInvalidFileHandlerTypeElement,
             handler_id,
             std::string(base::IntToString(i)));
         return false;
@@ -94,7 +95,7 @@ bool LoadFileHandler(const std::string& handler_id,
     for (size_t i = 0; i < file_extensions->GetSize(); ++i) {
       if (!file_extensions->GetString(i, &file_extension)) {
         *error = ErrorUtils::FormatErrorMessageUTF16(
-            extension_manifest_errors::kInvalidFileHandlerExtensionElement,
+            errors::kInvalidFileHandlerExtensionElement,
             handler_id,
             std::string(base::IntToString(i)));
         return false;
@@ -112,7 +113,7 @@ bool FileHandlersParser::Parse(Extension* extension, string16* error) {
   const base::DictionaryValue* all_handlers = NULL;
   if (!extension->manifest()->GetDictionary(keys::kFileHandlers,
                                             &all_handlers)) {
-    *error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlers);
+    *error = ASCIIToUTF16(errors::kInvalidFileHandlers);
     return false;
   }
 
@@ -126,7 +127,7 @@ bool FileHandlersParser::Parse(Extension* extension, string16* error) {
       if (!LoadFileHandler(iter.key(), *handler, &info->file_handlers, error))
         return false;
     } else {
-      *error = ASCIIToUTF16(extension_manifest_errors::kInvalidFileHandlers);
+      *error = ASCIIToUTF16(errors::kInvalidFileHandlers);
       return false;
     }
   }