Move parsing of NaCl modules out of Extension.

chrome/common/extensions/extension.cc

 // 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/extension.h"
 
 #include "base/base64.h"
 #include "base/basictypes.h"
 #include "base/command_line.h"
 #include "base/files/file_path.h"
@@ skipping 1011 matching lines @@
     // Override launch url to new tab.
     launch_web_url_ = chrome::kChromeUINewTabURL;
     extent_.ClearPatterns();
   }
 
   return true;
 }
 
 bool Extension::LoadSharedFeatures(string16* error) {
   if (!LoadDescription(error) ||
-      !ManifestHandler::ParseExtension(this, error) ||
-      !LoadNaClModules(error))
+      !ManifestHandler::ParseExtension(this, error))
     return false;
 
   return true;
 }
 
 bool Extension::LoadDescription(string16* error) {
   if (manifest_->HasKey(keys::kDescription) &&
       !manifest_->GetString(keys::kDescription, &description_)) {
     *error = ASCIIToUTF16(errors::kInvalidDescription);
     return false;
@@ skipping 20 matching lines @@
           switches::kAllowLegacyExtensionManifests)) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         errors::kInvalidManifestVersionOld,
         base::IntToString(kModernManifestVersion));
     return false;
   }
 
   return true;
 }
 
-bool Extension::LoadNaClModules(string16* error) {
-  if (!manifest_->HasKey(keys::kNaClModules))
-    return true;
-  const ListValue* list_value = NULL;
-  if (!manifest_->GetList(keys::kNaClModules, &list_value)) {
-    *error = ASCIIToUTF16(errors::kInvalidNaClModules);
-    return false;
-  }
-
-  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_modules_.push_back(NaClModuleInfo());
-    nacl_modules_.back().url = GetResourceURL(path_str);
-    nacl_modules_.back().mime_type = mime_type;
-  }
-
-  return true;
-}
-
 bool Extension::HasMultipleUISurfaces() const {
   int num_surfaces = 0;
 
   if (ActionInfo::GetPageActionInfo(this))
     ++num_surfaces;
 
   if (ActionInfo::GetBrowserActionInfo(this))
     ++num_surfaces;
 
   if (is_app())
@@ skipping 119 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions