| Index: extensions/browser/guest_view/extension_options/extension_options_guest.cc
 | 
| diff --git a/extensions/browser/guest_view/extension_options/extension_options_guest.cc b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 | 
| index f594ade9b2630e53a5138f14152cfa2356f9ff51..9f3c07af53e48b505f821c24747a125b91e4ca89 100644
 | 
| --- a/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 | 
| +++ b/extensions/browser/guest_view/extension_options/extension_options_guest.cc
 | 
| @@ -127,8 +127,8 @@ void ExtensionOptionsGuest::DidInitialize(
 | 
|  
 | 
|  void ExtensionOptionsGuest::GuestViewDidStopLoading() {
 | 
|    scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
 | 
| -  DispatchEventToView(new GuestViewEvent(
 | 
| -      extension_options_internal::OnLoad::kEventName, std::move(args)));
 | 
| +  DispatchEventToView(make_scoped_ptr(new GuestViewEvent(
 | 
| +      extension_options_internal::OnLoad::kEventName, std::move(args))));
 | 
|  }
 | 
|  
 | 
|  const char* ExtensionOptionsGuest::GetAPINamespace() const {
 | 
| @@ -148,9 +148,9 @@ void ExtensionOptionsGuest::OnPreferredSizeChanged(const gfx::Size& pref_size) {
 | 
|    // Convert the size from physical pixels to logical pixels.
 | 
|    options.width = PhysicalPixelsToLogicalPixels(pref_size.width());
 | 
|    options.height = PhysicalPixelsToLogicalPixels(pref_size.height());
 | 
| -  DispatchEventToView(new GuestViewEvent(
 | 
| +  DispatchEventToView(make_scoped_ptr(new GuestViewEvent(
 | 
|        extension_options_internal::OnPreferredSizeChanged::kEventName,
 | 
| -      options.ToValue()));
 | 
| +      options.ToValue())));
 | 
|  }
 | 
|  
 | 
|  bool ExtensionOptionsGuest::ShouldHandleFindRequestsForEmbedder() const {
 | 
| @@ -180,9 +180,9 @@ WebContents* ExtensionOptionsGuest::OpenURLFromTab(
 | 
|  }
 | 
|  
 | 
|  void ExtensionOptionsGuest::CloseContents(WebContents* source) {
 | 
| -  DispatchEventToView(
 | 
| +  DispatchEventToView(make_scoped_ptr(
 | 
|        new GuestViewEvent(extension_options_internal::OnClose::kEventName,
 | 
| -                         make_scoped_ptr(new base::DictionaryValue())));
 | 
| +                         make_scoped_ptr(new base::DictionaryValue()))));
 | 
|  }
 | 
|  
 | 
|  bool ExtensionOptionsGuest::HandleContextMenu(
 | 
| 
 |