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

Unified Diff: chrome/browser/extensions/api/messaging/extension_message_port.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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: chrome/browser/extensions/api/messaging/extension_message_port.cc
diff --git a/chrome/browser/extensions/api/messaging/extension_message_port.cc b/chrome/browser/extensions/api/messaging/extension_message_port.cc
index b517f9e66465835c08ecf6588b3f304fce2420a5..3225143c9fb01729dbd1af9d8defaa5e6e2189de 100644
--- a/chrome/browser/extensions/api/messaging/extension_message_port.cc
+++ b/chrome/browser/extensions/api/messaging/extension_message_port.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/messaging/extension_message_port.h"
+#include "base/memory/ptr_util.h"
#include "base/scoped_observer.h"
#include "chrome/browser/profiles/profile.h"
#include "content/public/browser/interstitial_page.h"
@@ -180,7 +181,7 @@ bool ExtensionMessagePort::IsValidPort() {
void ExtensionMessagePort::DispatchOnConnect(
const std::string& channel_name,
- scoped_ptr<base::DictionaryValue> source_tab,
+ std::unique_ptr<base::DictionaryValue> source_tab,
int source_frame_id,
int guest_process_id,
int guest_render_frame_routing_id,
@@ -200,19 +201,19 @@ void ExtensionMessagePort::DispatchOnConnect(
info.guest_process_id = guest_process_id;
info.guest_render_frame_routing_id = guest_render_frame_routing_id;
- SendToPort(make_scoped_ptr(new ExtensionMsg_DispatchOnConnect(
+ SendToPort(base::WrapUnique(new ExtensionMsg_DispatchOnConnect(
MSG_ROUTING_NONE, port_id_, channel_name, source, info, tls_channel_id)));
}
void ExtensionMessagePort::DispatchOnDisconnect(
const std::string& error_message) {
- SendToPort(make_scoped_ptr(new ExtensionMsg_DispatchOnDisconnect(
+ SendToPort(base::WrapUnique(new ExtensionMsg_DispatchOnDisconnect(
MSG_ROUTING_NONE, port_id_, error_message)));
}
void ExtensionMessagePort::DispatchOnMessage(const Message& message) {
- SendToPort(make_scoped_ptr(new ExtensionMsg_DeliverMessage(
- MSG_ROUTING_NONE, port_id_, message)));
+ SendToPort(base::WrapUnique(
+ new ExtensionMsg_DeliverMessage(MSG_ROUTING_NONE, port_id_, message)));
}
void ExtensionMessagePort::IncrementLazyKeepaliveCount() {
@@ -276,7 +277,7 @@ void ExtensionMessagePort::UnregisterFrame(content::RenderFrameHost* rfh) {
CloseChannel();
}
-void ExtensionMessagePort::SendToPort(scoped_ptr<IPC::Message> msg) {
+void ExtensionMessagePort::SendToPort(std::unique_ptr<IPC::Message> msg) {
DCHECK_GT(frames_.size(), 0UL);
if (extension_process_) {
// All extension frames reside in the same process, so we can just send a

Powered by Google App Engine
This is Rietveld 408576698