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

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

Issue 2227193002: Make UserScript non-copyable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: sync @tott 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/extension_service_unittest.cc
diff --git a/chrome/browser/extensions/extension_service_unittest.cc b/chrome/browser/extensions/extension_service_unittest.cc
index 9ab61ab6c9a7884c30f7418d155fc767a2b94716..8b87b05c4116e3738637691ab14bc564e8372d79 100644
--- a/chrome/browser/extensions/extension_service_unittest.cc
+++ b/chrome/browser/extensions/extension_service_unittest.cc
@@ -867,27 +867,27 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
const extensions::UserScriptList& scripts =
extensions::ContentScriptsInfo::GetContentScripts(extension);
ASSERT_EQ(2u, scripts.size());
- EXPECT_EQ(expected_patterns, scripts[0].url_patterns());
- EXPECT_EQ(2u, scripts[0].js_scripts().size());
+ EXPECT_EQ(expected_patterns, scripts[0]->url_patterns());
+ EXPECT_EQ(2u, scripts[0]->js_scripts().size());
ExtensionResource resource00(extension->id(),
- scripts[0].js_scripts()[0].extension_root(),
- scripts[0].js_scripts()[0].relative_path());
+ scripts[0]->js_scripts()[0]->extension_root(),
+ scripts[0]->js_scripts()[0]->relative_path());
base::FilePath expected_path =
base::MakeAbsoluteFilePath(extension->path().AppendASCII("script1.js"));
EXPECT_TRUE(resource00.ComparePathWithDefault(expected_path));
ExtensionResource resource01(extension->id(),
- scripts[0].js_scripts()[1].extension_root(),
- scripts[0].js_scripts()[1].relative_path());
+ scripts[0]->js_scripts()[1]->extension_root(),
+ scripts[0]->js_scripts()[1]->relative_path());
expected_path =
base::MakeAbsoluteFilePath(extension->path().AppendASCII("script2.js"));
EXPECT_TRUE(resource01.ComparePathWithDefault(expected_path));
EXPECT_TRUE(!extensions::PluginInfo::HasPlugins(extension));
- EXPECT_EQ(1u, scripts[1].url_patterns().patterns().size());
+ EXPECT_EQ(1u, scripts[1]->url_patterns().patterns().size());
EXPECT_EQ("http://*.news.com/*",
- scripts[1].url_patterns().begin()->GetAsString());
+ scripts[1]->url_patterns().begin()->GetAsString());
ExtensionResource resource10(extension->id(),
- scripts[1].js_scripts()[0].extension_root(),
- scripts[1].js_scripts()[0].relative_path());
+ scripts[1]->js_scripts()[0]->extension_root(),
+ scripts[1]->js_scripts()[0]->relative_path());
expected_path =
extension->path().AppendASCII("js_files").AppendASCII("script3.js");
expected_path = base::MakeAbsoluteFilePath(expected_path);
@@ -905,9 +905,9 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
EXPECT_EQ(std::string(), loaded_[1]->description());
EXPECT_EQ(loaded_[1]->GetResourceURL("background.html"),
extensions::BackgroundInfo::GetBackgroundURL(loaded_[1].get()));
- EXPECT_EQ(0u,
- extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get())
- .size());
+ EXPECT_TRUE(
+ extensions::ContentScriptsInfo::GetContentScripts(loaded_[1].get())
+ .empty());
// We don't parse the plugins section on Chrome OS.
#if defined(OS_CHROMEOS)
@@ -932,9 +932,9 @@ TEST_F(ExtensionServiceTest, LoadAllExtensionsFromDirectorySuccess) {
EXPECT_EQ(std::string(good2), loaded_[index]->id());
EXPECT_EQ(std::string("My extension 3"), loaded_[index]->name());
EXPECT_EQ(std::string(), loaded_[index]->description());
- EXPECT_EQ(0u,
- extensions::ContentScriptsInfo::GetContentScripts(
- loaded_[index].get()).size());
+ EXPECT_TRUE(
+ extensions::ContentScriptsInfo::GetContentScripts(loaded_[index].get())
+ .empty());
EXPECT_EQ(Manifest::INTERNAL, loaded_[index]->location());
}
@@ -2091,9 +2091,8 @@ TEST_F(ExtensionServiceTest, MAYBE_InstallTheme) {
ValidatePrefKeyCount(++pref_count);
ASSERT_TRUE(extension);
EXPECT_TRUE(extension->is_theme());
- EXPECT_EQ(
- 0u,
- extensions::ContentScriptsInfo::GetContentScripts(extension).size());
+ EXPECT_TRUE(
+ extensions::ContentScriptsInfo::GetContentScripts(extension).empty());
}
// A theme with image resources missing (misspelt path).

Powered by Google App Engine
This is Rietveld 408576698