Index: extensions/renderer/wake_event_page.cc |
diff --git a/extensions/renderer/wake_event_page.cc b/extensions/renderer/wake_event_page.cc |
index e3e21899bef03b0b5a952f790f545a7890032d5a..a6f18838471f59d1569f0afcea1c3e3a6a3ffefe 100644 |
--- a/extensions/renderer/wake_event_page.cc |
+++ b/extensions/renderer/wake_event_page.cc |
@@ -4,6 +4,7 @@ |
#include "extensions/renderer/wake_event_page.h" |
+#include <memory> |
#include <utility> |
#include "base/atomic_sequence_num.h" |
@@ -12,7 +13,6 @@ |
#include "base/lazy_instance.h" |
#include "base/logging.h" |
#include "base/macros.h" |
-#include "base/memory/scoped_ptr.h" |
#include "content/public/child/worker_thread.h" |
#include "content/public/renderer/render_thread.h" |
#include "extensions/common/extension_messages.h" |
@@ -160,7 +160,7 @@ void WakeEventPage::MakeRequest(const std::string& extension_id, |
static base::AtomicSequenceNumber sequence_number; |
int request_id = sequence_number.GetNext(); |
{ |
- scoped_ptr<RequestData> request_data( |
+ std::unique_ptr<RequestData> request_data( |
new RequestData(content::WorkerThread::GetCurrentId(), on_response)); |
base::AutoLock lock(requests_lock_); |
requests_.set(request_id, std::move(request_data)); |
@@ -180,7 +180,7 @@ bool WakeEventPage::OnControlMessageReceived(const IPC::Message& message) { |
} |
void WakeEventPage::OnWakeEventPageResponse(int request_id, bool success) { |
- scoped_ptr<RequestData> request_data; |
+ std::unique_ptr<RequestData> request_data; |
{ |
base::AutoLock lock(requests_lock_); |
request_data = requests_.take(request_id); |