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

ui/views/style/mac/dialog_button_border_mac_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 "ui/views/style/mac/dialog_button_border_mac.h"
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
@@ skipping 13 matching lines @@
       : LabelButton(nullptr, base::ASCIIToUTF16(text)) {}
 
   void SimulateAddToWidget() { OnNativeThemeChanged(nullptr); }
   void set_provide_custom_border(bool value) { provide_custom_border_ = value; }
 
   // LabelButton:
   std::unique_ptr<LabelButtonBorder> CreateDefaultBorder() const override {
     if (!provide_custom_border_)
       return LabelButton::CreateDefaultBorder();
 
-    return base::WrapUnique(new LabelButtonAssetBorder(style()));
+    return base::MakeUnique<LabelButtonAssetBorder>(style());
   }
 
  private:
   bool provide_custom_border_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(TestLabelButton);
 };
 
 gfx::Size DialogButtonBorderMacSize() {
   const DialogButtonBorderMac template_border;
@@ skipping 146 matching lines @@
 
   // Any call to SetBorder() will immediately prevent themed buttons and adding
   // to a Widget (to pick up a NativeTheme) shouldn't restore them.
   button.SetBorder(Border::NullBorder());
   EXPECT_FALSE(BorderIsDialogButton(button));
   button.SimulateAddToWidget();
   EXPECT_FALSE(BorderIsDialogButton(button));
 }
 
 }  // namespace views