Move ContentScripts out of Extension

chrome/browser/extensions/convert_user_script_unittest.cc

Index: chrome/browser/extensions/convert_user_script_unittest.cc
diff --git a/chrome/browser/extensions/convert_user_script_unittest.cc b/chrome/browser/extensions/convert_user_script_unittest.cc
index 960bf9e074142a3db4880efc74d17c780e1279fb..652c69e1305295e6f77bf3c349588396c249acae 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/extensions/convert_user_script.h"
 #include "chrome/common/chrome_paths.h"
+#include "chrome/common/extensions/api/content_scripts/content_scripts_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -55,8 +56,9 @@ TEST(ExtensionFromUserScript, Basic) {
   EXPECT_EQ("IhCFCg9PMQTAcJdc9ytUP99WME+4yh6aMnM1uupkovo=",
             extension->public_key());
 
-  ASSERT_EQ(1u, extension->content_scripts().size());
-  const UserScript& script = extension->content_scripts()[0];
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  const UserScript& script =
+      ContentScriptsInfo::GetContentScripts(extension)[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
   ASSERT_EQ(2u, script.globs().size());
   EXPECT_EQ("http://www.google.com/*", script.globs().at(0));
@@ -105,8 +107,9 @@ TEST(ExtensionFromUserScript, NoMetdata) {
   EXPECT_EQ("k1WxKx54hX6tfl5gQaXD/m4d9QUMwRdXWM4RW+QkWcY=",
             extension->public_key());
 
-  ASSERT_EQ(1u, extension->content_scripts().size());
-  const UserScript& script = extension->content_scripts()[0];
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  const UserScript& script =
+      ContentScriptsInfo::GetContentScripts(extension)[0];
   ASSERT_EQ(1u, script.globs().size());
   EXPECT_EQ("*", script.globs()[0]);
   EXPECT_EQ(0u, script.exclude_globs().size());
@@ -169,8 +172,9 @@ TEST(ExtensionFromUserScript, RunAtDocumentStart) {
             extension->public_key());
 
   // Validate run location.
-  ASSERT_EQ(1u, extension->content_scripts().size());
-  const UserScript& script = extension->content_scripts()[0];
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  const UserScript& script =
+      ContentScriptsInfo::GetContentScripts(extension)[0];
   EXPECT_EQ(UserScript::DOCUMENT_START, script.run_location());
 }
 
@@ -202,8 +206,9 @@ TEST(ExtensionFromUserScript, RunAtDocumentEnd) {
             extension->public_key());
 
   // Validate run location.
-  ASSERT_EQ(1u, extension->content_scripts().size());
-  const UserScript& script = extension->content_scripts()[0];
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  const UserScript& script =
+      ContentScriptsInfo::GetContentScripts(extension)[0];
   EXPECT_EQ(UserScript::DOCUMENT_END, script.run_location());
 }
 
@@ -236,8 +241,9 @@ TEST(ExtensionFromUserScript, RunAtDocumentIdle) {
             extension->public_key());
 
   // Validate run location.
-  ASSERT_EQ(1u, extension->content_scripts().size());
-  const UserScript& script = extension->content_scripts()[0];
+  ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension).size());
+  const UserScript& script =
+      ContentScriptsInfo::GetContentScripts(extension)[0];
   EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }