Make UserScript non-copyable.

chrome/browser/extensions/extension_user_script_loader_unittest.cc

Index: chrome/browser/extensions/extension_user_script_loader_unittest.cc
diff --git a/chrome/browser/extensions/extension_user_script_loader_unittest.cc b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
index 2e5db25ca8e6e93e0260b0990c64cc10d83c2e51..532b6b1bc0994dd86f94c58d320072c69b9a6bc0 100644
--- a/chrome/browser/extensions/extension_user_script_loader_unittest.cc
+++ b/chrome/browser/extensions/extension_user_script_loader_unittest.cc
@@ -13,6 +13,7 @@
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/location.h"
+#include "base/memory/ptr_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/strings/string_util.h"
 #include "chrome/browser/chrome_notification_types.h"
@@ -21,6 +22,7 @@
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_browser_thread.h"
+#include "extensions/browser/browser_user_script.h"
 #include "extensions/common/host_id.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -124,7 +126,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse1) {
     "\n"
     "alert('hoo!');\n");
 
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
   ASSERT_EQ(3U, script.globs().size());
   EXPECT_EQ("*mail.google.com*", script.globs()[0]);
@@ -135,7 +137,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse1) {
 TEST_F(ExtensionUserScriptLoaderTest, Parse2) {
   const std::string text("default to @include *");
 
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
   ASSERT_EQ(1U, script.globs().size());
   EXPECT_EQ("*", script.globs()[0]);
@@ -147,7 +149,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse3) {
     "// @include *foo*\n"
     "// ==/UserScript=="); // no trailing newline
 
-  UserScript script;
+  BrowserUserScript script;
   ExtensionUserScriptLoader::ParseMetadataHeader(text, &script);
   ASSERT_EQ(1U, script.globs().size());
   EXPECT_EQ("*foo*", script.globs()[0]);
@@ -164,7 +166,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse4) {
   AddPattern(&expected_patterns, "http://*.mail.google.com/*");
   AddPattern(&expected_patterns, "http://mail.yahoo.com/*");
 
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
   EXPECT_EQ(0U, script.globs().size());
   EXPECT_EQ(expected_patterns, script.url_patterns());
@@ -177,7 +179,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse5) {
     "// ==/UserScript==\n");
 
   // Invalid @match value.
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_FALSE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
 }
 
@@ -189,7 +191,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse6) {
     "// ==/UserScript==\n");
 
   // Allowed to match @include and @match.
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
 }
 
@@ -202,7 +204,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse7) {
     "\t// @match  \t http://mail.yahoo.com/*\n"
     "// ==/UserScript==\n");
 
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
   ASSERT_EQ("hello", script.name());
   ASSERT_EQ("wiggity woo", script.description());
@@ -219,7 +221,7 @@ TEST_F(ExtensionUserScriptLoaderTest, Parse8) {
     "// @exclude_match http://www.google.com/foo*\n"
     "// ==/UserScript==\n");
 
-  UserScript script;
+  BrowserUserScript script;
   EXPECT_TRUE(ExtensionUserScriptLoader::ParseMetadataHeader(text, &script));
   ASSERT_EQ("myscript", script.name());
   ASSERT_EQ(1U, script.url_patterns().patterns().size());
@@ -236,12 +238,13 @@ TEST_F(ExtensionUserScriptLoaderTest, SkipBOMAtTheBeginning) {
   size_t written = base::WriteFile(path, content.c_str(), content.size());
   ASSERT_EQ(written, content.size());
 
-  UserScript user_script;
-  user_script.js_scripts().push_back(
-      UserScript::File(temp_dir_.path(), path.BaseName(), GURL()));
+  std::unique_ptr<BrowserUserScript> user_script(new BrowserUserScript);
+  std::unique_ptr<BrowserScriptFile> file1(
+      new BrowserScriptFile(temp_dir_.path(), path.BaseName(), GURL()));
+  user_script->js_scripts().push_back(std::move(file1));
 
-  UserScriptList user_scripts;
-  user_scripts.push_back(user_script);
+  BrowserUserScriptList user_scripts;
+  user_scripts.push_back(std::move(user_script));
 
   TestingProfile profile;
   ExtensionUserScriptLoader loader(
@@ -251,7 +254,7 @@ TEST_F(ExtensionUserScriptLoaderTest, SkipBOMAtTheBeginning) {
   loader.LoadScriptsForTest(&user_scripts);
 
   EXPECT_EQ(content.substr(3),
-            user_scripts[0].js_scripts()[0].GetContent().as_string());
+            user_scripts[0]->js_scripts()[0]->GetContent().as_string());
 }
 
 TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
@@ -260,12 +263,12 @@ TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
   size_t written = base::WriteFile(path, content.c_str(), content.size());
   ASSERT_EQ(written, content.size());
 
-  UserScript user_script;
-  user_script.js_scripts().push_back(UserScript::File(
-      temp_dir_.path(), path.BaseName(), GURL()));
+  std::unique_ptr<BrowserUserScript> user_script(new BrowserUserScript);
+  user_script->js_scripts().push_back(base::WrapUnique(
+      new BrowserScriptFile(temp_dir_.path(), path.BaseName(), GURL())));
 
-  UserScriptList user_scripts;
-  user_scripts.push_back(user_script);
+  BrowserUserScriptList user_scripts;
+  user_scripts.push_back(std::move(user_script));
 
   TestingProfile profile;
   ExtensionUserScriptLoader loader(
@@ -274,7 +277,8 @@ TEST_F(ExtensionUserScriptLoaderTest, LeaveBOMNotAtTheBeginning) {
       true /* listen_for_extension_system_loaded */);
   loader.LoadScriptsForTest(&user_scripts);
 
-  EXPECT_EQ(content, user_scripts[0].js_scripts()[0].GetContent().as_string());
+  EXPECT_EQ(content,
+            user_scripts[0]->js_scripts()[0]->GetContent().as_string());
 }
 
 }  // namespace extensions