Move ContentScripts out of Extension

chrome/common/extensions/extension_file_util.cc

Index: chrome/common/extensions/extension_file_util.cc
diff --git a/chrome/common/extensions/extension_file_util.cc b/chrome/common/extensions/extension_file_util.cc
index 5a225d88d02e24ce707fb7ef9539a75212f02786..d93fb85f48ff47d20460d742c0bae99bb687d85a 100644
--- a/chrome/common/extensions/extension_file_util.cc
+++ b/chrome/common/extensions/extension_file_util.cc
@@ -19,6 +19,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
 #include "chrome/common/extensions/api/extension_action/action_info.h"
 #include "chrome/common/extensions/api/extension_action/browser_action_handler.h"
 #include "chrome/common/extensions/extension.h"
@@ -293,8 +294,10 @@ bool ValidateExtension(const Extension* extension,
     symlink_policy = ExtensionResource::SYMLINKS_MUST_RESOLVE_WITHIN_ROOT;
   }
 
-  for (size_t i = 0; i < extension->content_scripts().size(); ++i) {
-    const extensions::UserScript& script = extension->content_scripts()[i];
+  const extensions::UserScriptList& content_scripts =
+      extensions::ContentScriptsInfo::GetContentScripts(extension);
+  for (size_t i = 0; i < content_scripts.size(); ++i) {
+    const extensions::UserScript& script = content_scripts[i];
 
     for (size_t j = 0; j < script.js_scripts().size(); j++) {
       const extensions::UserScript::File& js_script = script.js_scripts()[j];