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

chrome/browser/ui/content_settings/content_setting_image_model.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/content_settings/content_setting_image_model.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "build/build_config.h"
 #include "chrome/browser/content_settings/host_content_settings_map_factory.h"
@@ skipping 186 matching lines @@
       TabSpecificContentSettings::FromWebContents(web_contents);
   if (content_settings)
     content_settings->SetBlockageHasBeenIndicated(content_type());
 }
 
 // static
 std::unique_ptr<ContentSettingImageModel>
 ContentSettingSimpleImageModel::CreateForContentTypeForTesting(
     ContentSettingsType content_settings_type) {
   if (content_settings_type == CONTENT_SETTINGS_TYPE_GEOLOCATION)
-    return base::WrapUnique(new ContentSettingGeolocationImageModel());
+    return base::MakeUnique<ContentSettingGeolocationImageModel>();
 
   if (content_settings_type == CONTENT_SETTINGS_TYPE_PROTOCOL_HANDLERS)
-    return base::WrapUnique(new ContentSettingRPHImageModel());
+    return base::MakeUnique<ContentSettingRPHImageModel>();
 
   if (content_settings_type == CONTENT_SETTINGS_TYPE_MIDI_SYSEX)
-    return base::WrapUnique(new ContentSettingMIDISysExImageModel());
+    return base::MakeUnique<ContentSettingMIDISysExImageModel>();
 
-  return base::WrapUnique(
-      new ContentSettingBlockedImageModel(content_settings_type));
+  return base::MakeUnique<ContentSettingBlockedImageModel>(
+      content_settings_type);
 }
 
 // Generic blocked content settings --------------------------------------------
 
 ContentSettingBlockedImageModel::ContentSettingBlockedImageModel(
     ContentSettingsType content_type)
     : ContentSettingSimpleImageModel(content_type) {
 }
 
 void ContentSettingBlockedImageModel::UpdateFromWebContents(
@@ skipping 342 matching lines @@
 
 #if defined(OS_MACOSX)
 bool ContentSettingImageModel::UpdateFromWebContentsAndCheckIfIconChanged(
     content::WebContents* web_contents) {
   gfx::VectorIconId old_icon = icon_id_;
   gfx::VectorIconId old_badge_icon = icon_badge_id_;
   UpdateFromWebContents(web_contents);
   return old_icon != icon_id_ && old_badge_icon != icon_badge_id_;
 }
 #endif