| Index: extensions/browser/user_script_loader.cc
|
| diff --git a/extensions/browser/user_script_loader.cc b/extensions/browser/user_script_loader.cc
|
| index 0855deb9026a4324995a4e001e977b75ca4b2bbc..6ebe496964e0d23c73c1481ea3d79ffee966d12d 100644
|
| --- a/extensions/browser/user_script_loader.cc
|
| +++ b/extensions/browser/user_script_loader.cc
|
| @@ -359,7 +359,7 @@ void UserScriptLoader::SetReady(bool ready) {
|
| void UserScriptLoader::OnScriptsLoaded(
|
| std::unique_ptr<UserScriptList> user_scripts,
|
| std::unique_ptr<base::SharedMemory> shared_memory) {
|
| - user_scripts_.reset(user_scripts.release());
|
| + user_scripts_ = std::move(user_scripts);
|
| if (pending_load_) {
|
| // While we were loading, there were further changes. Don't bother
|
| // notifying about these scripts and instead just immediately reload.
|
| @@ -381,7 +381,7 @@ void UserScriptLoader::OnScriptsLoaded(
|
| }
|
|
|
| // We've got scripts ready to go.
|
| - shared_memory_.reset(shared_memory.release());
|
| + shared_memory_ = std::move(shared_memory);
|
|
|
| for (content::RenderProcessHost::iterator i(
|
| content::RenderProcessHost::AllHostsIterator());
|
|
|