Move parsing of NaCl modules out of Extension.

chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc

Index: chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc
diff --git a/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc
new file mode 100644
index 0000000000000000000000000000000000000000..f5071d544de079cf00c86c055a75d64b64fbe6c3
--- /dev/null
+++ b/chrome/common/extensions/manifest_handlers/nacl_modules_handler.cc
@@ -0,0 +1,90 @@
+// Copyright (c) 2013 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+#include "chrome/common/extensions/manifest_handlers/nacl_modules_handler.h"
+
+#include "base/lazy_instance.h"
+#include "base/memory/scoped_ptr.h"
+#include "base/string_number_conversions.h"
+#include "base/utf_string_conversions.h"
+#include "base/values.h"
+#include "chrome/common/extensions/extension_manifest_constants.h"
+#include "extensions/common/error_utils.h"
+
+namespace extensions {
+
+namespace keys = extension_manifest_keys;
+namespace errors = extension_manifest_errors;
+
+namespace {
+
+struct NaClModuleData : Extension::ManifestData {
+  // Optional list of NaCl modules and associated properties.
+  NaClModuleInfo::List nacl_modules_;
+};
+
+}  // namespace
+
+// static
+const NaClModuleInfo::List* NaClModuleInfo::GetNaClModules(
+    const Extension* extension) {
+  NaClModuleData* data = static_cast<NaClModuleData*>(
+      extension->GetManifestData(keys::kNaClModules));

[not at google - send to devlin, 2013/05/29 16:29:21]

I feel like GetManifestData should be called like

extension->GetManifestData<NaclModuleData>(keys::kNcalModules)

but that's entirely unrelated to this patch.

[Yoyo Zhou, 2013/05/29 22:27:47]

Sounds reasonable. We could have exactly the same amount of type-unsafety we
have now. Not in this patch, though.

+  return data ? &data->nacl_modules_ : NULL;
+}
+
+NaClModulesHandler::NaClModulesHandler() {
+}
+
+NaClModulesHandler::~NaClModulesHandler() {
+}
+
+bool NaClModulesHandler::Parse(Extension* extension,
+                               string16* error) {
+  const ListValue* list_value = NULL;
+  if (!extension->manifest()->GetList(keys::kNaClModules, &list_value)) {
+    *error = ASCIIToUTF16(errors::kInvalidNaClModules);
+    return false;
+  }
+
+  scoped_ptr<NaClModuleData> nacl_module_data(new NaClModuleData);
+
+  for (size_t i = 0; i < list_value->GetSize(); ++i) {
+    const DictionaryValue* module_value = NULL;
+    if (!list_value->GetDictionary(i, &module_value)) {
+      *error = ASCIIToUTF16(errors::kInvalidNaClModules);
+      return false;
+    }
+
+    // Get nacl_modules[i].path.
+    std::string path_str;
+    if (!module_value->GetString(keys::kNaClModulesPath, &path_str)) {
+      *error = ErrorUtils::FormatErrorMessageUTF16(
+          errors::kInvalidNaClModulesPath, base::IntToString(i));
+      return false;
+    }
+
+    // Get nacl_modules[i].mime_type.
+    std::string mime_type;
+    if (!module_value->GetString(keys::kNaClModulesMIMEType, &mime_type)) {
+      *error = ErrorUtils::FormatErrorMessageUTF16(
+          errors::kInvalidNaClModulesMIMEType, base::IntToString(i));
+      return false;
+    }
+
+    nacl_module_data->nacl_modules_.push_back(NaClModuleInfo());
+    nacl_module_data->nacl_modules_.back().url =
+        extension->GetResourceURL(path_str);
+    nacl_module_data->nacl_modules_.back().mime_type = mime_type;
+  }
+
+  extension->SetManifestData(keys::kNaClModules, nacl_module_data.release());
+  return true;
+}
+
+const std::vector<std::string> NaClModulesHandler::Keys() const {
+  return SingleKey(keys::kNaClModules);
+}
+
+}  // namespace extensions