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

Unified Diff: extensions/browser/extension_user_script_loader.cc

Issue 1909773002: Convert //extensions/browser from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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 3b3f10cea832dc1d456baa06766355189b46059f..c4be84388a4eb8a3fe243b234123a4cc60adae9f 100644
--- a/extensions/browser/extension_user_script_loader.cc
+++ b/extensions/browser/extension_user_script_loader.cc
@@ -129,7 +129,7 @@ void LoadUserScripts(UserScriptList* user_scripts,
for (UserScript& script : *user_scripts) {
if (added_script_ids.count(script.id()) == 0)
continue;
- scoped_ptr<SubstitutionMap> localization_messages(
+ std::unique_ptr<SubstitutionMap> localization_messages(
GetLocalizationMessages(hosts_info, script.host_id()));
for (UserScript::File& script_file : script.js_scripts()) {
if (script_file.GetContent().empty())
@@ -144,14 +144,14 @@ void LoadUserScripts(UserScriptList* user_scripts,
}
void LoadScriptsOnFileThread(
- scoped_ptr<UserScriptList> user_scripts,
+ std::unique_ptr<UserScriptList> user_scripts,
const ExtensionUserScriptLoader::HostsInfo& hosts_info,
const std::set<int>& added_script_ids,
const scoped_refptr<ContentVerifier>& verifier,
UserScriptLoader::LoadScriptsCallback callback) {
DCHECK(user_scripts.get());
LoadUserScripts(user_scripts.get(), hosts_info, added_script_ids, verifier);
- scoped_ptr<base::SharedMemory> memory =
+ std::unique_ptr<base::SharedMemory> memory =
UserScriptLoader::Serialize(*user_scripts);
content::BrowserThread::PostTask(
content::BrowserThread::UI, FROM_HERE,
@@ -196,7 +196,7 @@ void ExtensionUserScriptLoader::LoadScriptsForTest(
}
void ExtensionUserScriptLoader::LoadScripts(
- scoped_ptr<UserScriptList> user_scripts,
+ std::unique_ptr<UserScriptList> user_scripts,
const std::set<HostID>& changed_hosts,
const std::set<int>& added_script_ids,
LoadScriptsCallback callback) {
« no previous file with comments | « extensions/browser/extension_user_script_loader.h ('k') | extensions/browser/extension_zoom_request_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698