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

gpu/command_buffer/tests/gl_compressed_copy_texture_CHROMIUM_unittest.cc

 // Copyright (c) 2015 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.
 
 #ifndef GL_GLEXT_PROTOTYPES
 #define GL_GLEXT_PROTOTYPES
 #endif
 
 #include <GLES2/gl2.h>
 #include <GLES2/gl2ext.h>
@@ skipping 150 matching lines @@
     const uint8_t* data;
     const GLsizei data_size;
 
     Image(const GLint format, const uint8_t* data, const GLsizei data_size)
         : format(format), data(data), data_size(data_size) {}
   };
   std::vector<std::unique_ptr<Image>> supported_formats;
 
   if (GLTestHelper::HasExtension("GL_AMD_compressed_ATC_texture") ||
       GLTestHelper::HasExtension("GL_ATI_texture_compression_atitc")) {
-    supported_formats.push_back(base::WrapUnique(new Image(
-        GL_ATC_RGB_AMD, kCompressedImageATC, sizeof(kCompressedImageATC))));
-    supported_formats.push_back(base::WrapUnique(
-        new Image(GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD, kCompressedImageATCIA,
-                  sizeof(kCompressedImageATCIA))));
+    supported_formats.push_back(base::MakeUnique<Image>(
+        GL_ATC_RGB_AMD, kCompressedImageATC, sizeof(kCompressedImageATC)));
+    supported_formats.push_back(base::MakeUnique<Image>(
+        GL_ATC_RGBA_INTERPOLATED_ALPHA_AMD, kCompressedImageATCIA,
+        sizeof(kCompressedImageATCIA)));
   }
   if (GLTestHelper::HasExtension("GL_EXT_texture_compression_dxt1")) {
-    supported_formats.push_back(base::WrapUnique(
-        new Image(GL_COMPRESSED_RGB_S3TC_DXT1_EXT, kCompressedImageDXT1,
-                  sizeof(kCompressedImageDXT1))));
+    supported_formats.push_back(base::MakeUnique<Image>(
+        GL_COMPRESSED_RGB_S3TC_DXT1_EXT, kCompressedImageDXT1,
+        sizeof(kCompressedImageDXT1)));
   }
   if (GLTestHelper::HasExtension("GL_ANGLE_texture_compression_dxt5") ||
       GLTestHelper::HasExtension("GL_EXT_texture_compression_s3tc")) {
-    supported_formats.push_back(base::WrapUnique(
-        new Image(GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, kCompressedImageDXT5,
-                  sizeof(kCompressedImageDXT5))));
+    supported_formats.push_back(base::MakeUnique<Image>(
+        GL_COMPRESSED_RGBA_S3TC_DXT5_EXT, kCompressedImageDXT5,
+        sizeof(kCompressedImageDXT5)));
   }
   if (GLTestHelper::HasExtension("GL_OES_compressed_ETC1_RGB8_texture")) {
-    supported_formats.push_back(base::WrapUnique(new Image(
-        GL_ETC1_RGB8_OES, kCompressedImageETC1, sizeof(kCompressedImageETC1))));
+    supported_formats.push_back(base::MakeUnique<Image>(
+        GL_ETC1_RGB8_OES, kCompressedImageETC1, sizeof(kCompressedImageETC1)));
   }
 
   for (const auto& image : supported_formats) {
     glBindTexture(GL_TEXTURE_2D, textures_[0]);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
     glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     glCompressedTexImage2D(GL_TEXTURE_2D, 0, image->format,
                            4, 4, 0, image->data_size, image->data);
@@ skipping 197 matching lines @@
   glGetIntegerv(GL_TEXTURE_BINDING_2D, &bound_texture);
   EXPECT_EQ(texture_ids[0], static_cast<GLuint>(bound_texture));
   glBindTexture(GL_TEXTURE_2D, 0);
 
   glDeleteTextures(2, texture_ids);
 
   EXPECT_TRUE(GL_NO_ERROR == glGetError());
 }
 
 }  // namespace gpu