Index: extensions/browser/web_ui_user_script_loader.cc |
diff --git a/extensions/browser/web_ui_user_script_loader.cc b/extensions/browser/web_ui_user_script_loader.cc |
index 6954f25188e3f1f60e070ceba90cfc1a7d21068b..a16c7f70a8993ed6eefc9407245c725f38dbd18b 100644 |
--- a/extensions/browser/web_ui_user_script_loader.cc |
+++ b/extensions/browser/web_ui_user_script_loader.cc |
@@ -16,9 +16,9 @@ |
namespace { |
void SerializeOnFileThread( |
- scoped_ptr<extensions::UserScriptList> user_scripts, |
+ std::unique_ptr<extensions::UserScriptList> user_scripts, |
extensions::UserScriptLoader::LoadScriptsCallback callback) { |
- scoped_ptr<base::SharedMemory> memory = |
+ std::unique_ptr<base::SharedMemory> memory = |
extensions::UserScriptLoader::Serialize(*user_scripts); |
content::BrowserThread::PostTask( |
content::BrowserThread::UI, FROM_HERE, |
@@ -61,7 +61,7 @@ void WebUIUserScriptLoader::AddScripts( |
} |
void WebUIUserScriptLoader::LoadScripts( |
- scoped_ptr<extensions::UserScriptList> user_scripts, |
+ std::unique_ptr<extensions::UserScriptList> user_scripts, |
const std::set<HostID>& changed_hosts, |
const std::set<int>& added_script_ids, |
LoadScriptsCallback callback) { |
@@ -114,7 +114,7 @@ void WebUIUserScriptLoader::CreateWebUIURLFetchers( |
// The WebUIUserScriptLoader owns these WebUIURLFetchers. Once the |
// loader is destroyed, all the fetchers will be destroyed. Therefore, |
// we are sure it is safe to use base::Unretained(this) here. |
- scoped_ptr<WebUIURLFetcher> fetcher(new WebUIURLFetcher( |
+ std::unique_ptr<WebUIURLFetcher> fetcher(new WebUIURLFetcher( |
browser_context, render_process_id, render_view_id, file.url(), |
base::Bind(&WebUIUserScriptLoader::OnSingleWebUIURLFetchComplete, |
base::Unretained(this), &file))); |