Index: components/guest_view/browser/guest_view_base.cc |
diff --git a/components/guest_view/browser/guest_view_base.cc b/components/guest_view/browser/guest_view_base.cc |
index 634b1f7900b7eb7b5798e865f6de57b17037a76e..64b33d55a25da94119471a7492738f48368ca646 100644 |
--- a/components/guest_view/browser/guest_view_base.cc |
+++ b/components/guest_view/browser/guest_view_base.cc |
@@ -758,7 +758,7 @@ void GuestViewBase::DispatchEventToGuestProxy(GuestViewEvent* event) { |
void GuestViewBase::DispatchEventToView(GuestViewEvent* event) { |
if (!attached() && |
(!CanRunInDetachedState() || !can_owner_receive_events())) { |
- pending_events_.push_back(linked_ptr<GuestViewEvent>(event)); |
+ pending_events_.push_back(make_scoped_ptr(event)); |
dcheng
2016/01/27 22:18:27
Another alternative is:
pending_events_.emplace_ba
|
return; |
} |
@@ -769,9 +769,9 @@ void GuestViewBase::SendQueuedEvents() { |
if (!attached()) |
return; |
while (!pending_events_.empty()) { |
- linked_ptr<GuestViewEvent> event_ptr = pending_events_.front(); |
+ scoped_ptr<GuestViewEvent> event_ptr = std::move(pending_events_.front()); |
pending_events_.pop_front(); |
- event_ptr.release()->Dispatch(this, view_instance_id_); |
+ event_ptr->Dispatch(this, view_instance_id_); |
} |
} |