Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1706)

Unified Diff: chrome/browser/extensions/convert_user_script_unittest.cc

Issue 2227193002: Make UserScript non-copyable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: uplaod with base Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 ad65bddc714be1732a935d9f23f093fa74c14a78..27b4eea750ffa98d3df004b0612df1b6e34e398e 100644
--- a/chrome/browser/extensions/convert_user_script_unittest.cc
+++ b/chrome/browser/extensions/convert_user_script_unittest.cc
@@ -63,8 +63,8 @@ TEST_F(ExtensionFromUserScript, Basic) {
EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
- const UserScript& script =
- ContentScriptsInfo::GetContentScripts(extension.get())[0];
+ const ScriptMetadata& script =
+ *ContentScriptsInfo::GetContentScripts(extension.get())[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));
@@ -81,7 +81,7 @@ TEST_F(ExtensionFromUserScript, Basic) {
// Make sure the files actually exist on disk.
EXPECT_TRUE(base::PathExists(
- extension->path().Append(script.js_scripts()[0].relative_path())));
+ extension->path().Append(script.js_scripts()[0]->relative_path())));
EXPECT_TRUE(base::PathExists(
extension->path().Append(kManifestFilename)));
}
@@ -116,8 +116,8 @@ TEST_F(ExtensionFromUserScript, NoMetadata) {
EXPECT_EQ(Manifest::TYPE_USER_SCRIPT, extension->GetType());
ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
- const UserScript& script =
- ContentScriptsInfo::GetContentScripts(extension.get())[0];
+ const ScriptMetadata& script =
+ *ContentScriptsInfo::GetContentScripts(extension.get())[0];
ASSERT_EQ(1u, script.globs().size());
EXPECT_EQ("*", script.globs()[0]);
EXPECT_EQ(0u, script.exclude_globs().size());
@@ -130,7 +130,7 @@ TEST_F(ExtensionFromUserScript, NoMetadata) {
// Make sure the files actually exist on disk.
EXPECT_TRUE(base::PathExists(
- extension->path().Append(script.js_scripts()[0].relative_path())));
+ extension->path().Append(script.js_scripts()[0]->relative_path())));
EXPECT_TRUE(base::PathExists(
extension->path().Append(kManifestFilename)));
}
@@ -183,8 +183,8 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentStart) {
// Validate run location.
ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
- const UserScript& script =
- ContentScriptsInfo::GetContentScripts(extension.get())[0];
+ const ScriptMetadata& script =
+ *ContentScriptsInfo::GetContentScripts(extension.get())[0];
EXPECT_EQ(UserScript::DOCUMENT_START, script.run_location());
}
@@ -218,8 +218,8 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentEnd) {
// Validate run location.
ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
- const UserScript& script =
- ContentScriptsInfo::GetContentScripts(extension.get())[0];
+ const ScriptMetadata& script =
+ *ContentScriptsInfo::GetContentScripts(extension.get())[0];
EXPECT_EQ(UserScript::DOCUMENT_END, script.run_location());
}
@@ -254,8 +254,8 @@ TEST_F(ExtensionFromUserScript, RunAtDocumentIdle) {
// Validate run location.
ASSERT_EQ(1u, ContentScriptsInfo::GetContentScripts(extension.get()).size());
- const UserScript& script =
- ContentScriptsInfo::GetContentScripts(extension.get())[0];
+ const ScriptMetadata& script =
+ *ContentScriptsInfo::GetContentScripts(extension.get())[0];
EXPECT_EQ(UserScript::DOCUMENT_IDLE, script.run_location());
}

Powered by Google App Engine
This is Rietveld 408576698