Re-write many calls to WrapUnique() with MakeUnique()

extensions/browser/guest_view/extension_options/extension_options_guest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 
 #include <utility>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
@@ skipping 110 matching lines @@
     const base::DictionaryValue& create_params) {
   ExtensionsAPIClient::Get()->AttachWebContentsHelpers(web_contents());
   web_contents()->GetController().LoadURL(options_page_,
                                           content::Referrer(),
                                           ui::PAGE_TRANSITION_LINK,
                                           std::string());
 }
 
 void ExtensionOptionsGuest::GuestViewDidStopLoading() {
   std::unique_ptr<base::DictionaryValue> args(new base::DictionaryValue());
-  DispatchEventToView(base::WrapUnique(new GuestViewEvent(
-      extension_options_internal::OnLoad::kEventName, std::move(args))));
+  DispatchEventToView(base::MakeUnique<GuestViewEvent>(
+      extension_options_internal::OnLoad::kEventName, std::move(args)));
 }
 
 const char* ExtensionOptionsGuest::GetAPINamespace() const {
   return extensionoptions::kAPINamespace;
 }
 
 int ExtensionOptionsGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_EXTENSIONOPTIONS_TAG_PREFIX;
 }
 
 bool ExtensionOptionsGuest::IsPreferredSizeModeEnabled() const {
   return true;
 }
 
 void ExtensionOptionsGuest::OnPreferredSizeChanged(const gfx::Size& pref_size) {
   extension_options_internal::PreferredSizeChangedOptions options;
   // Convert the size from physical pixels to logical pixels.
   options.width = PhysicalPixelsToLogicalPixels(pref_size.width());
   options.height = PhysicalPixelsToLogicalPixels(pref_size.height());
-  DispatchEventToView(base::WrapUnique(new GuestViewEvent(
+  DispatchEventToView(base::MakeUnique<GuestViewEvent>(
       extension_options_internal::OnPreferredSizeChanged::kEventName,
-      options.ToValue())));
+      options.ToValue()));
 }
 
 bool ExtensionOptionsGuest::ShouldHandleFindRequestsForEmbedder() const {
   return true;
 }
 
 WebContents* ExtensionOptionsGuest::OpenURLFromTab(
     WebContents* source,
     const content::OpenURLParams& params) {
   if (!extension_options_guest_delegate_)
     return nullptr;
 
   // Don't allow external URLs with the CURRENT_TAB disposition be opened in
   // this guest view, change the disposition to NEW_FOREGROUND_TAB.
   if ((!params.url.SchemeIs(extensions::kExtensionScheme) ||
        params.url.host() != options_page_.host()) &&
       params.disposition == CURRENT_TAB) {
     return extension_options_guest_delegate_->OpenURLInNewTab(
         content::OpenURLParams(params.url,
                                params.referrer,
                                params.frame_tree_node_id,
                                NEW_FOREGROUND_TAB,
                                params.transition,
                                params.is_renderer_initiated));
   }
   return extension_options_guest_delegate_->OpenURLInNewTab(params);
 }
 
 void ExtensionOptionsGuest::CloseContents(WebContents* source) {
-  DispatchEventToView(base::WrapUnique(
-      new GuestViewEvent(extension_options_internal::OnClose::kEventName,
-                         base::WrapUnique(new base::DictionaryValue()))));
+  DispatchEventToView(base::MakeUnique<GuestViewEvent>(
+      extension_options_internal::OnClose::kEventName,
+      base::WrapUnique(new base::DictionaryValue())));
 }
 
 bool ExtensionOptionsGuest::HandleContextMenu(
     const content::ContextMenuParams& params) {
   if (!extension_options_guest_delegate_)
     return false;
 
   return extension_options_guest_delegate_->HandleContextMenu(params);
 }
 
@@ skipping 36 matching lines @@
     SetGuestZoomLevelToMatchEmbedder();
 
     if (!url::IsSameOriginWith(params.url, options_page_)) {
       bad_message::ReceivedBadMessage(web_contents()->GetRenderProcessHost(),
                                       bad_message::EOG_BAD_ORIGIN);
     }
   }
 }
 
 }  // namespace extensions