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

components/exo/sub_surface_unittest.cc

 // Copyright 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.
 
 #include "components/exo/sub_surface.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/exo/surface.h"
 #include "components/exo/test/exo_test_base.h"
 #include "components/exo/test/exo_test_helper.h"
@@ skipping 22 matching lines @@
   EXPECT_EQ(gfx::Point().ToString(),
             surface->window()->bounds().origin().ToString());
 
   // Check that position is updated when Commit() is called.
   parent->Commit();
   EXPECT_EQ(position.ToString(),
             surface->window()->bounds().origin().ToString());
 
   // Create and commit a new sub-surface using the same surface.
   sub_surface.reset();
-  sub_surface = base::WrapUnique(new SubSurface(surface.get(), parent.get()));
+  sub_surface = base::MakeUnique<SubSurface>(surface.get(), parent.get());
   parent->Commit();
 
   // Initial position should be reset to origin.
   EXPECT_EQ(gfx::Point().ToString(),
             surface->window()->bounds().origin().ToString());
 }
 
 TEST_F(SubSurfaceTest, PlaceAbove) {
   std::unique_ptr<Surface> parent(new Surface);
   std::unique_ptr<Surface> surface1(new Surface);
@@ skipping 97 matching lines @@
   child->Commit();
 
   // A Commit() call on child should be sufficient for the position of
   // grandchild to take effect when synchronous is disabled.
   EXPECT_EQ(position2.ToString(),
             grandchild->window()->bounds().origin().ToString());
 }
 
 }  // namespace
 }  // namespace exo