Make UserScript non-copyable.

extensions/common/user_script_unittest.cc

Index: extensions/common/user_script_unittest.cc
diff --git a/extensions/common/user_script_unittest.cc b/extensions/common/user_script_unittest.cc
index 5923f4c003cb9b0136487114d7236a661fdeeaea..ee0339d6e9504c691183929d83671b93fae294e9 100644
--- a/extensions/common/user_script_unittest.cc
+++ b/extensions/common/user_script_unittest.cc
@@ -6,6 +6,7 @@
 #include <stdint.h>
 
 #include "base/files/file_path.h"
+#include "base/memory/ptr_util.h"
 #include "base/pickle.h"
 #include "extensions/common/user_script.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -21,7 +22,7 @@ static const int kAllSchemes =
     URLPattern::SCHEME_CHROMEUI;
 
 TEST(ExtensionUserScriptTest, Glob_HostString) {
-  UserScript script;
+  ScriptMetadata script;
   script.add_glob("*mail.google.com*");
   script.add_glob("*mail.yahoo.com*");
   script.add_glob("*mail.msn.com*");
@@ -40,7 +41,7 @@ TEST(ExtensionUserScriptTest, Glob_HostString) {
 }
 
 TEST(ExtensionUserScriptTest, Glob_TrailingSlash) {
-  UserScript script;
+  ScriptMetadata script;
   script.add_glob("*mail.google.com/");
   // GURL normalizes the URL to have a trailing "/"
   EXPECT_TRUE(script.MatchesURL(GURL("http://mail.google.com")));
@@ -49,7 +50,7 @@ TEST(ExtensionUserScriptTest, Glob_TrailingSlash) {
 }
 
 TEST(ExtensionUserScriptTest, Glob_TrailingSlashStar) {
-  UserScript script;
+  ScriptMetadata script;
   script.add_glob("http://mail.google.com/*");
   // GURL normalizes the URL to have a trailing "/"
   EXPECT_TRUE(script.MatchesURL(GURL("http://mail.google.com")));
@@ -58,7 +59,7 @@ TEST(ExtensionUserScriptTest, Glob_TrailingSlashStar) {
 }
 
 TEST(ExtensionUserScriptTest, Glob_Star) {
-  UserScript script;
+  ScriptMetadata script;
   script.add_glob("*");
   EXPECT_TRUE(script.MatchesURL(GURL("http://foo.com/bar")));
   EXPECT_TRUE(script.MatchesURL(GURL("http://hot.com/dog")));
@@ -68,7 +69,7 @@ TEST(ExtensionUserScriptTest, Glob_Star) {
 }
 
 TEST(ExtensionUserScriptTest, Glob_StringAnywhere) {
-  UserScript script;
+  ScriptMetadata script;
   script.add_glob("*foo*");
   EXPECT_TRUE(script.MatchesURL(GURL("http://foo.com/bar")));
   EXPECT_TRUE(script.MatchesURL(GURL("http://baz.org/foo/bar")));
@@ -79,7 +80,7 @@ TEST(ExtensionUserScriptTest, UrlPattern) {
   URLPattern pattern(kAllSchemes);
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*/foo*"));
 
-  UserScript script;
+  ScriptMetadata script;
   script.add_url_pattern(pattern);
   EXPECT_TRUE(script.MatchesURL(GURL("http://monkey.com/foobar")));
   EXPECT_FALSE(script.MatchesURL(GURL("http://monkey.com/hotdog")));
@@ -88,7 +89,7 @@ TEST(ExtensionUserScriptTest, UrlPattern) {
 }
 
 TEST(ExtensionUserScriptTest, ExcludeUrlPattern) {
-  UserScript script;
+  ScriptMetadata script;
 
   URLPattern pattern(kAllSchemes);
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
@@ -104,7 +105,7 @@ TEST(ExtensionUserScriptTest, ExcludeUrlPattern) {
 }
 
 TEST(ExtensionUserScriptTest, UrlPatternAndIncludeGlobs) {
-  UserScript script;
+  ScriptMetadata script;
 
   URLPattern pattern(kAllSchemes);
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
@@ -118,7 +119,7 @@ TEST(ExtensionUserScriptTest, UrlPatternAndIncludeGlobs) {
 }
 
 TEST(ExtensionUserScriptTest, UrlPatternAndExcludeGlobs) {
-  UserScript script;
+  ScriptMetadata script;
 
   URLPattern pattern(kAllSchemes);
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, pattern.Parse("http://*.nytimes.com/*"));
@@ -133,7 +134,7 @@ TEST(ExtensionUserScriptTest, UrlPatternAndExcludeGlobs) {
 
 TEST(ExtensionUserScriptTest, UrlPatternGlobInteraction) {
   // If there are both, match intersection(union(globs), union(urlpatterns)).
-  UserScript script;
+  ScriptMetadata script;
 
   URLPattern pattern(kAllSchemes);
   ASSERT_EQ(URLPattern::PARSE_SUCCESS,
@@ -172,19 +173,19 @@ TEST(ExtensionUserScriptTest, Pickle) {
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, exclude1.Parse("*://*/*bar"));
   ASSERT_EQ(URLPattern::PARSE_SUCCESS, exclude2.Parse("https://*/*"));
 
-  UserScript script1;
-  script1.js_scripts().push_back(UserScript::File(
-      base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
-      base::FilePath(FILE_PATH_LITERAL("foo.user.js")),
-      GURL("chrome-extension://abc/foo.user.js")));
-  script1.css_scripts().push_back(UserScript::File(
-      base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
-      base::FilePath(FILE_PATH_LITERAL("foo.user.css")),
-      GURL("chrome-extension://abc/foo.user.css")));
-  script1.css_scripts().push_back(UserScript::File(
-      base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
-      base::FilePath(FILE_PATH_LITERAL("foo2.user.css")),
-      GURL("chrome-extension://abc/foo2.user.css")));
+  ScriptMetadata script1;
+  script1.js_scripts().push_back(base::WrapUnique(
+      new UserScriptFileInfo(base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+                             base::FilePath(FILE_PATH_LITERAL("foo.user.js")),
+                             GURL("chrome-extension://abc/foo.user.js"))));
+  script1.css_scripts().push_back(base::WrapUnique(
+      new UserScriptFileInfo(base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+                             base::FilePath(FILE_PATH_LITERAL("foo.user.css")),
+                             GURL("chrome-extension://abc/foo.user.css"))));
+  script1.css_scripts().push_back(base::WrapUnique(
+      new UserScriptFileInfo(base::FilePath(FILE_PATH_LITERAL("c:\\foo\\")),
+                             base::FilePath(FILE_PATH_LITERAL("foo2.user.css")),
+                             GURL("chrome-extension://abc/foo2.user.css"))));
   script1.set_run_location(UserScript::DOCUMENT_START);
 
   script1.add_url_pattern(pattern1);
@@ -199,18 +200,31 @@ TEST(ExtensionUserScriptTest, Pickle) {
   script1.set_host_id(id);
 
   base::Pickle pickle;
-  script1.Pickle(&pickle);
+  // Pickle script.
+  {
+    // Only browser/ side (BrowserUserScript) and renderer/ side
+    // (RendererUserScript) implementation of user script is (de)serializable,
+    // ScriptMetadata is common/, so pickle it manually.
+    static_cast<UserScriptInfo*>(&script1)->Pickle(&pickle);
+    static_cast<UserScriptFiles<UserScriptFileInfo>*>(&script1)->PickleFiles(
+        &pickle);
+  }
 
   base::PickleIterator iter(pickle);
-  UserScript script2;
-  script2.Unpickle(pickle, &iter);
+  ScriptMetadata script2;
+  {
+    // Same as Pickle step above, unpickle this manually.
+    static_cast<UserScriptInfo*>(&script2)->Unpickle(pickle, &iter);
+    static_cast<UserScriptFiles<UserScriptFileInfo>*>(&script2)->UnpickleFiles(
+        pickle, &iter);
+  }
 
   EXPECT_EQ(1U, script2.js_scripts().size());
-  EXPECT_EQ(script1.js_scripts()[0].url(), script2.js_scripts()[0].url());
+  EXPECT_EQ(script1.js_scripts()[0]->url(), script2.js_scripts()[0]->url());
 
   EXPECT_EQ(2U, script2.css_scripts().size());
   for (size_t i = 0; i < script2.js_scripts().size(); ++i) {
-    EXPECT_EQ(script1.css_scripts()[i].url(), script2.css_scripts()[i].url());
+    EXPECT_EQ(script1.css_scripts()[i]->url(), script2.css_scripts()[i]->url());
   }
 
   ASSERT_EQ(script1.globs().size(), script2.globs().size());
@@ -226,7 +240,7 @@ TEST(ExtensionUserScriptTest, Pickle) {
 }
 
 TEST(ExtensionUserScriptTest, Defaults) {
-  UserScript script;
+  ScriptMetadata script;
   ASSERT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
 }