Revert 149610 - Extension resources should only load in contexts the extension has permission to ac…

chrome/common/extensions/extension.cc

 // Copyright (c) 2012 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 <ostream>
 
 #include "base/base64.h"
 #include "base/basictypes.h"
@@ skipping 518 matching lines @@
   return ResourceMatches(web_accessible_resources_, relative_path);
 }
 
 bool Extension::HasWebAccessibleResources() const {
   if (web_accessible_resources_.size())
     return true;
 
   return false;
 }
 
-bool Extension::HasNaClModules() const {
-  if (nacl_modules_.size())
-    return true;
-
-  return false;
-}
-
 bool Extension::IsSandboxedPage(const std::string& relative_path) const {
   return ResourceMatches(sandboxed_pages_, relative_path);
 }
 
-bool Extension::IsResourceNaClManifest(const std::string& resource) const {
-  GURL url = extension_url_.Resolve(resource);
-  for (std::vector<NaClModuleInfo>::const_iterator it = nacl_modules_.begin();
-       it != nacl_modules_.end(); it++) {
-    if (it->url == url)
-      return true;
-  }
-  return false;
-}
-
 
 std::string Extension::GetResourceContentSecurityPolicy(
     const std::string& relative_path) const {
   return IsSandboxedPage(relative_path) ?
       sandboxed_pages_content_security_policy_ : content_security_policy_;
 }
 
 bool Extension::GenerateId(const std::string& input, std::string* output) {
   DCHECK(output);
   uint8 hash[Extension::kIdSize];
@@ skipping 3345 matching lines @@
 
 UpdatedExtensionPermissionsInfo::UpdatedExtensionPermissionsInfo(
     const Extension* extension,
     const PermissionSet* permissions,
     Reason reason)
     : reason(reason),
       extension(extension),
       permissions(permissions) {}
 
 }   // namespace extensions