Move ContentScripts out of Extension

chrome/browser/chromeos/accessibility/accessibility_util.cc

Index: chrome/browser/chromeos/accessibility/accessibility_util.cc
diff --git a/chrome/browser/chromeos/accessibility/accessibility_util.cc b/chrome/browser/chromeos/accessibility/accessibility_util.cc
index e5a8476b68122ffd1ae4a857a2e58e92770232ce..e2fbb777f2b5740ee4ac933b505ec79f539f69ad 100644
--- a/chrome/browser/chromeos/accessibility/accessibility_util.cc
+++ b/chrome/browser/chromeos/accessibility/accessibility_util.cc
@@ -27,6 +27,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/speech/tts_controller.h"
 #include "chrome/browser/ui/singleton_tabs.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
@@ -197,8 +198,10 @@ void EnableSpokenFeedback(bool enabled,
           extension->id(), render_view_host->GetProcess()->GetID(),
           render_view_host->GetRoutingID());
 
-      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 &file = script.js_scripts()[j];
           ExtensionResource resource = extension->GetResource(