Move parsing of NaCl modules out of Extension.

chrome/common/extensions/extension.h

 // 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.
 
 #ifndef CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 #define CHROME_COMMON_EXTENSIONS_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
@@ skipping 90 matching lines @@
     UPGRADE,
     NEW_INSTALL
   };
 
   enum SyncType {
     SYNC_TYPE_NONE = 0,
     SYNC_TYPE_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.
   struct ManifestData {
     virtual ~ManifestData() {}
   };
 
   enum InitFromValueFlags {
     NO_FLAGS = 0,
 
@@ skipping 180 matching lines @@
   const std::string& non_localized_name() const { return non_localized_name_; }
   // Base64-encoded version of the key used to sign this extension.
   // In pseudocode, returns
   // base::Base64Encode(RSAPrivateKey(pem_file).ExportPublicKey()).
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   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();
   }
 
   // Appends |new_warning[s]| to install_warnings_.
   void AddInstallWarning(const InstallWarning& new_warning);
   void AddInstallWarnings(const std::vector<InstallWarning>& new_warnings);
   const std::vector<InstallWarning>& install_warnings() const {
     return install_warnings_;
@@ skipping 72 matching lines @@
                   URLPatternSet* extent,
                   const char* list_error,
                   const char* value_error,
                   string16* error);
   bool LoadLaunchContainer(string16* error);
   bool LoadLaunchURL(string16* error);
 
   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.
   bool HasMultipleUISurfaces() const;
 
   // Updates the launch URL and extents for the extension using the given
   // |override_url|.
   void OverrideLaunchUrl(const GURL& override_url);
 
   bool CheckMinimumChromeVersion(string16* error) const;
@@ skipping 39 matching lines @@
   // The extension's version.
   scoped_ptr<base::Version> version_;
 
   // An optional longer description of the extension.
   std::string description_;
 
   // True if the extension was generated from a user script. (We show slightly
   // 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_;
 
   // The manifest from which this extension was created.
   scoped_ptr<Manifest> manifest_;
 
   // Stored parsed manifest data.
   ManifestDataMap manifest_data_;
 
   // Set to true at the end of InitValue when initialization is finished.
@@ skipping 104 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_COMMON_EXTENSIONS_EXTENSION_H_