Move ContentScripts out of Extension

chrome/common/extensions/permissions/permission_set.cc

Index: chrome/common/extensions/permissions/permission_set.cc
diff --git a/chrome/common/extensions/permissions/permission_set.cc b/chrome/common/extensions/permissions/permission_set.cc
index 380f72a5fc9122b19f477a4561b5ad89e3aaf47c..704255b9592307d831f5ffd16610b7cc70c47b36 100644
--- a/chrome/common/extensions/permissions/permission_set.cc
+++ b/chrome/common/extensions/permissions/permission_set.cc
@@ -10,6 +10,7 @@
 
 #include "chrome/common/extensions/api/plugins/plugins_handler.h"
 #include "chrome/common/extensions/extension.h"
+#include "chrome/common/extensions/manifest_handlers/content_scripts_handler.h"
 #include "chrome/common/extensions/manifest_url_handler.h"
 #include "chrome/common/extensions/permissions/permissions_info.h"
 #include "content/public/common/url_constants.h"
@@ -535,8 +536,9 @@ void PermissionSet::InitImplicitExtensionPermissions(
 
   // Add the scriptable hosts.
   for (extensions::UserScriptList::const_iterator content_script =
-           extension->content_scripts().begin();
-       content_script != extension->content_scripts().end(); ++content_script) {
+           ContentScriptsInfo::GetContentScripts(extension).begin();
+       content_script != ContentScriptsInfo::GetContentScripts(extension).end();
+       ++content_script) {
     URLPatternSet::const_iterator pattern =
         content_script->url_patterns().begin();
     for (; pattern != content_script->url_patterns().end(); ++pattern)