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

ui/gfx/image/image.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 "ui/gfx/image/image.h"
 
 #include <algorithm>
 #include <set>
 #include <utility>
 
@@ skipping 390 matching lines @@
   std::vector<ImagePNGRep> filtered;
   for (size_t i = 0; i < image_reps.size(); ++i) {
     if (image_reps[i].raw_data.get() && image_reps[i].raw_data->size())
       filtered.push_back(image_reps[i]);
   }
 
   if (filtered.empty())
     return;
 
   storage_ = new internal::ImageStorage(Image::kImageRepPNG);
-  AddRepresentation(base::WrapUnique(new internal::ImageRepPNG(filtered)));
+  AddRepresentation(base::MakeUnique<internal::ImageRepPNG>(filtered));
 }
 
 Image::Image(const ImageSkia& image) {
   if (!image.isNull()) {
     storage_ = new internal::ImageStorage(Image::kImageRepSkia);
     AddRepresentation(
-        base::WrapUnique(new internal::ImageRepSkia(new ImageSkia(image))));
+        base::MakeUnique<internal::ImageRepSkia>(new ImageSkia(image)));
   }
 }
 
 #if defined(OS_IOS)
 Image::Image(UIImage* image)
     : storage_(new internal::ImageStorage(Image::kImageRepCocoaTouch)) {
   if (image)
-    AddRepresentation(
-        base::WrapUnique(new internal::ImageRepCocoaTouch(image)));
+    AddRepresentation(base::MakeUnique<internal::ImageRepCocoaTouch>(image));
 }
 #elif defined(OS_MACOSX)
 Image::Image(NSImage* image) {
   if (image) {
     storage_ = new internal::ImageStorage(Image::kImageRepCocoa);
-    AddRepresentation(base::WrapUnique(new internal::ImageRepCocoa(image)));
+    AddRepresentation(base::MakeUnique<internal::ImageRepCocoa>(image));
   }
 }
 #endif
 
 Image::Image(const Image& other) : storage_(other.storage_) {
 }
 
 Image& Image::operator=(const Image& other) {
   storage_ = other.storage_;
   return *this;
@@ skipping 313 matching lines @@
       storage_->representations().insert(std::make_pair(type, std::move(rep)));
 
   // insert should not fail (implies that there was already a representation of
   // that type in the map).
   CHECK(result.second) << "type was already in map.";
 
   return result.first->second.get();
 }
 
 }  // namespace gfx