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

chrome/browser/ui/android/infobars/confirm_infobar.cc

 // Copyright 2013 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/android/infobars/confirm_infobar.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/android/jni_string.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "components/infobars/core/confirm_infobar_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ConfirmInfoBar_jni.h"
 #include "ui/android/window_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/image/image.h"
 
 using base::android::JavaParamRef;
 using base::android::ScopedJavaLocalRef;
 
 // InfoBarService -------------------------------------------------------------
 
 std::unique_ptr<infobars::InfoBar> InfoBarService::CreateConfirmInfoBar(
     std::unique_ptr<ConfirmInfoBarDelegate> delegate) {
-  return base::WrapUnique(new ConfirmInfoBar(std::move(delegate)));
+  return base::MakeUnique<ConfirmInfoBar>(std::move(delegate));
 }
 
 
 // ConfirmInfoBar -------------------------------------------------------------
 
 ConfirmInfoBar::ConfirmInfoBar(std::unique_ptr<ConfirmInfoBarDelegate> delegate)
     : InfoBarAndroid(std::move(delegate)) {}
 
 ConfirmInfoBar::~ConfirmInfoBar() {
 }
@@ skipping 56 matching lines @@
 ConfirmInfoBarDelegate* ConfirmInfoBar::GetDelegate() {
   return delegate()->AsConfirmInfoBarDelegate();
 }
 
 base::string16 ConfirmInfoBar::GetTextFor(
     ConfirmInfoBarDelegate::InfoBarButton button) {
   ConfirmInfoBarDelegate* delegate = GetDelegate();
   return (delegate->GetButtons() & button) ?
       delegate->GetButtonLabel(button) : base::string16();
 }