Index: extensions/renderer/script_injection_manager.cc |
diff --git a/extensions/renderer/script_injection_manager.cc b/extensions/renderer/script_injection_manager.cc |
index 0e234d0906bbc96895e8bc7b56a05d2fec8d2dc6..eddd599f919a29e2587865f39418ba8a1d1ef860 100644 |
--- a/extensions/renderer/script_injection_manager.cc |
+++ b/extensions/renderer/script_injection_manager.cc |
@@ -4,11 +4,12 @@ |
#include "extensions/renderer/script_injection_manager.h" |
+#include <memory> |
#include <utility> |
#include "base/auto_reset.h" |
#include "base/bind.h" |
-#include "base/memory/scoped_ptr.h" |
+#include "base/memory/ptr_util.h" |
#include "base/memory/weak_ptr.h" |
#include "base/values.h" |
#include "content/public/renderer/render_frame.h" |
@@ -270,7 +271,7 @@ ScriptInjectionManager::~ScriptInjectionManager() { |
void ScriptInjectionManager::OnRenderFrameCreated( |
content::RenderFrame* render_frame) { |
- rfo_helpers_.push_back(make_scoped_ptr(new RFOHelper(render_frame, this))); |
+ rfo_helpers_.push_back(base::WrapUnique(new RFOHelper(render_frame, this))); |
} |
void ScriptInjectionManager::OnExtensionUnloaded( |
@@ -290,7 +291,7 @@ void ScriptInjectionManager::OnInjectionFinished( |
ScriptInjection* injection) { |
auto iter = |
std::find_if(running_injections_.begin(), running_injections_.end(), |
- [injection](const scoped_ptr<ScriptInjection>& mode) { |
+ [injection](const std::unique_ptr<ScriptInjection>& mode) { |
return injection == mode.get(); |
}); |
if (iter != running_injections_.end()) |
@@ -398,7 +399,7 @@ void ScriptInjectionManager::InjectScripts( |
// (if a script removes its own frame, for example). If this happens, abort. |
if (!active_injection_frames_.count(frame)) |
break; |
- scoped_ptr<ScriptInjection> injection(std::move(*iter)); |
+ std::unique_ptr<ScriptInjection> injection(std::move(*iter)); |
iter = frame_injections.erase(iter); |
TryToInject(std::move(injection), run_location, &scripts_run_info); |
} |
@@ -410,7 +411,7 @@ void ScriptInjectionManager::InjectScripts( |
} |
void ScriptInjectionManager::TryToInject( |
- scoped_ptr<ScriptInjection> injection, |
+ std::unique_ptr<ScriptInjection> injection, |
UserScript::RunLocation run_location, |
ScriptsRunInfo* scripts_run_info) { |
// Try to inject the script. If the injection is waiting (i.e., for |
@@ -437,7 +438,7 @@ void ScriptInjectionManager::TryToInject( |
void ScriptInjectionManager::HandleExecuteCode( |
const ExtensionMsg_ExecuteCode_Params& params, |
content::RenderFrame* render_frame) { |
- scoped_ptr<const InjectionHost> injection_host; |
+ std::unique_ptr<const InjectionHost> injection_host; |
if (params.host_id.type() == HostID::EXTENSIONS) { |
injection_host = ExtensionInjectionHost::Create(params.host_id.id()); |
if (!injection_host) |
@@ -447,8 +448,8 @@ void ScriptInjectionManager::HandleExecuteCode( |
new WebUIInjectionHost(params.host_id)); |
} |
- scoped_ptr<ScriptInjection> injection(new ScriptInjection( |
- scoped_ptr<ScriptInjector>( |
+ std::unique_ptr<ScriptInjection> injection(new ScriptInjection( |
+ std::unique_ptr<ScriptInjector>( |
new ProgrammaticScriptInjector(params, render_frame)), |
render_frame, std::move(injection_host), |
static_cast<UserScript::RunLocation>(params.run_at))); |
@@ -467,13 +468,9 @@ void ScriptInjectionManager::HandleExecuteDeclarativeScript( |
const ExtensionId& extension_id, |
int script_id, |
const GURL& url) { |
- scoped_ptr<ScriptInjection> injection = |
+ std::unique_ptr<ScriptInjection> injection = |
user_script_set_manager_->GetInjectionForDeclarativeScript( |
- script_id, |
- render_frame, |
- tab_id, |
- url, |
- extension_id); |
+ script_id, render_frame, tab_id, url, extension_id); |
if (injection.get()) { |
ScriptsRunInfo scripts_run_info(render_frame, UserScript::BROWSER_DRIVEN); |
// TODO(markdittmer): Use return value of TryToInject for error handling. |
@@ -499,7 +496,7 @@ void ScriptInjectionManager::HandlePermitScriptInjection(int64_t request_id) { |
// know that this is the same page that issued the request (otherwise, |
// RFOHelper::InvalidateAndResetFrame would have caused it to be cleared out). |
- scoped_ptr<ScriptInjection> injection(std::move(*iter)); |
+ std::unique_ptr<ScriptInjection> injection(std::move(*iter)); |
pending_injections_.erase(iter); |
ScriptsRunInfo scripts_run_info(injection->render_frame(), |