Remove SandboxedPages and SandboxedCSP from Extension Class

chrome/common/extensions/csp_handler.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/csp_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/common/extensions/csp_validator.h"
 #include "chrome/common/extensions/extension_manifest_constants.h"
+#include "chrome/common/extensions/manifest_handlers/sandboxed_page_info.h"
 
 namespace keys = extension_manifest_keys;
 namespace errors = extension_manifest_errors;
 
 using extensions::csp_validator::ContentSecurityPolicyIsLegal;
 using extensions::csp_validator::ContentSecurityPolicyIsSecure;
 
 namespace extensions {
 
 namespace {
@@ skipping 30 matching lines @@
 }
 
 // static
 const std::string& CSPInfo::GetContentSecurityPolicy(
     const Extension* extension) {
   CSPInfo* csp_info = static_cast<CSPInfo*>(
           extension->GetManifestData(keys::kContentSecurityPolicy));
   return csp_info ? csp_info->content_security_policy : EmptyString();
 }
 
+// static
+const std::string& CSPInfo::GetResourceContentSecurityPolicy(
+    const Extension* extension,
+    const std::string& relative_path) {
+  return SandboxedPageInfo::IsSandboxedPage(extension, relative_path) ?
+      SandboxedPageInfo::GetContentSecurityPolicy(extension) :
+      GetContentSecurityPolicy(extension);
+}
+
 CSPHandler::CSPHandler(bool is_platform_app)
     : is_platform_app_(is_platform_app) {
 }
 
 CSPHandler::~CSPHandler() {
 }
 
 bool CSPHandler::Parse(Extension* extension, string16* error) {
   const std::string key = Keys()[0];
   if (!extension->manifest()->HasPath(key)) {
@@ skipping 41 matching lines @@
         type == Manifest::TYPE_LEGACY_PACKAGED_APP;
 }
 
 const std::vector<std::string> CSPHandler::Keys() const {
   const std::string& key = is_platform_app_ ?
       keys::kPlatformAppContentSecurityPolicy : keys::kContentSecurityPolicy;
   return SingleKey(key);
 }
 
 }  // namespace extensions