Move parsing of NaCl modules out of Extension.

chrome/common/extensions/extension.h

Index: chrome/common/extensions/extension.h
diff --git a/chrome/common/extensions/extension.h b/chrome/common/extensions/extension.h
index 11dc237ff6ac11a0a3ecb504e53160b8c0f75f57..345680aa30c20e3a85a590a4fdbbd6e37c3246ac 100644
--- a/chrome/common/extensions/extension.h
+++ b/chrome/common/extensions/extension.h
@@ -108,12 +108,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
     SYNC_TYPE_APP
   };
 
-  // An NaCl module included in the extension.
-  struct NaClModuleInfo {
-    GURL url;
-    std::string mime_type;
-  };
-
   // A base class for parsed manifest data that APIs want to store on
   // the extension. Related to base::SupportsUserData, but with an immutable
   // thread-safe interface to match Extension.
@@ -314,9 +308,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
-  const std::vector<NaClModuleInfo>& nacl_modules() const {
-    return nacl_modules_;
-  }
   PermissionsData* permissions_data() { return permissions_data_.get(); }
   const PermissionsData* permissions_data() const {
     return permissions_data_.get();
@@ -409,7 +400,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   bool LoadSharedFeatures(string16* error);
   bool LoadDescription(string16* error);
   bool LoadManifestVersion(string16* error);
-  bool LoadNaClModules(string16* error);
 
   // Returns true if the extension has more than one "UI surface". For example,
   // an extension that has a browser action and a page action.
@@ -469,9 +459,6 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // different UI if so).
   bool converted_from_user_script_;
 
-  // Optional list of NaCl modules and associated properties.
-  std::vector<NaClModuleInfo> nacl_modules_;
-
   // The public key used to sign the contents of the crx package.
   std::string public_key_;