Add nacl_modules key to extension manifests

chrome/common/extensions/extension.cc

 // Copyright (c) 2011 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/extension.h"
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 1716 matching lines @@
           return false;
         }
       }
 
       plugins_.push_back(PluginInfo());
       plugins_.back().path = path().AppendASCII(path_str);
       plugins_.back().is_public = is_public;
     }
   }
 
+  if (CommandLine::ForCurrentProcess()->HasSwitch(
+          switches::kEnableExperimentalExtensionApis) &&
+      source.HasKey(keys::kNaClModules)) {
+    ListValue* list_value;

[Aaron Boodman, 2011/04/08 00:07:37]

nit: initialize primitives

+    if (!source.GetList(keys::kNaClModules, &list_value)) {
+      *error = errors::kInvalidNaClModules;
+      return false;
+    }
+
+    for (size_t i = 0; i < list_value->GetSize(); ++i) {
+      DictionaryValue* module_value;
+      std::string path_str;
+      std::string mime_type;
+
+      if (!list_value->GetDictionary(i, &module_value)) {
+        *error = errors::kInvalidNaClModules;
+        return false;
+      }
+
+      // Get nacl_modules[i].path.
+      if (!module_value->GetString(keys::kNaClModulesPath, &path_str)) {
+        *error = ExtensionErrorUtils::FormatErrorMessage(
+            errors::kInvalidNaClModulesPath, base::IntToString(i));
+        return false;
+      }
+
+      // Get nacl_modules[i].mime_type.
+      if (!module_value->GetString(keys::kNaClModulesMIMEType, &mime_type)) {
+        *error = ExtensionErrorUtils::FormatErrorMessage(
+            errors::kInvalidNaClModulesMIMEType, base::IntToString(i));
+        return false;
+      }
+
+      nacl_modules_.push_back(NaClModuleInfo());
+      nacl_modules_.back().path = path().AppendASCII(path_str);
+      nacl_modules_.back().mime_type = mime_type;
+    }
+  }
+
   // Initialize background url (optional).
   if (source.HasKey(keys::kBackground)) {
     std::string background_str;
     if (!source.GetString(keys::kBackground, &background_str)) {
       *error = errors::kInvalidBackground;
       return false;
     }
     background_url_ = GetResourceURL(background_str);
   }
 
@@ skipping 847 matching lines @@
 
 UninstalledExtensionInfo::~UninstalledExtensionInfo() {}
 
 
 UnloadedExtensionInfo::UnloadedExtensionInfo(
     const Extension* extension,
     Reason reason)
   : reason(reason),
     already_disabled(false),
     extension(extension) {}