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

Unified Diff: extensions/browser/extension_user_script_loader.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: extensions/browser/extension_user_script_loader.cc
diff --git a/extensions/browser/extension_user_script_loader.cc b/extensions/browser/extension_user_script_loader.cc
index b28821bb4e2a5dffffaaac1469a2e4aa56bbdc56..2fe0ecab4aa1a9324a76c65d56f7963fb22f9209 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -128,19 +128,22 @@ void LoadUserScripts(UserScriptList* user_scripts,
const ExtensionUserScriptLoader::HostsInfo& hosts_info,
const std::set<int>& added_script_ids,
const scoped_refptr<ContentVerifier>& verifier) {
- for (UserScript& script : *user_scripts) {
- if (added_script_ids.count(script.id()) == 0)
+ for (const std::unique_ptr<UserScript>& script : *user_scripts) {
+ if (added_script_ids.count(script->id()) == 0)
continue;
- for (UserScript::File& script_file : script.js_scripts()) {
- if (script_file.GetContent().empty())
- LoadScriptContent(script.host_id(), &script_file, nullptr, verifier);
+ for (const std::unique_ptr<UserScript::File>& script_file :
+ script->js_scripts()) {
+ if (script_file->GetContent().empty())
+ LoadScriptContent(script->host_id(), script_file.get(), nullptr,
+ verifier);
}
- if (script.css_scripts().size() > 0) {
+ if (script->css_scripts().size() > 0) {
std::unique_ptr<SubstitutionMap> localization_messages(
- GetLocalizationMessages(hosts_info, script.host_id()));
- for (UserScript::File& script_file : script.css_scripts()) {
- if (script_file.GetContent().empty()) {
- LoadScriptContent(script.host_id(), &script_file,
+ GetLocalizationMessages(hosts_info, script->host_id()));
+ for (const std::unique_ptr<UserScript::File>& script_file :
+ script->css_scripts()) {
+ if (script_file->GetContent().empty()) {
+ LoadScriptContent(script->host_id(), script_file.get(),
localization_messages.get(), verifier);
}
}
@@ -193,8 +196,8 @@ void ExtensionUserScriptLoader::LoadScriptsForTest(
UserScriptList* user_scripts) {
HostsInfo info;
std::set<int> added_script_ids;
- for (UserScript& script : *user_scripts)
- added_script_ids.insert(script.id());
+ for (const std::unique_ptr<UserScript>& script : *user_scripts)
+ added_script_ids.insert(script->id());
LoadUserScripts(user_scripts, info, added_script_ids,
nullptr /* no verifier for testing */);

Powered by Google App Engine
This is Rietveld 408576698