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

chrome/browser/notifications/message_center_notification_manager.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 "chrome/browser/notifications/message_center_notification_manager.h"
 
 #include <memory>
 #include <utility>
 
 #include "base/logging.h"
@@ skipping 39 matching lines @@
     std::unique_ptr<message_center::NotifierSettingsProvider> settings_provider)
     : message_center_(message_center),
       settings_provider_(std::move(settings_provider)),
       system_observer_(this),
       stats_collector_(message_center),
       google_now_stats_collector_(message_center) {
   message_center_->AddObserver(this);
   message_center_->SetNotifierSettingsProvider(settings_provider_.get());
 
 #if defined(OS_CHROMEOS)
-  blockers_.push_back(base::WrapUnique(
-      new LoginStateNotificationBlockerChromeOS(message_center)));
+  blockers_.push_back(
+      base::MakeUnique<LoginStateNotificationBlockerChromeOS>(message_center));
 #else
   blockers_.push_back(
-      base::WrapUnique(new ScreenLockNotificationBlocker(message_center)));
+      base::MakeUnique<ScreenLockNotificationBlocker>(message_center));
 #endif
   blockers_.push_back(
-      base::WrapUnique(new FullscreenNotificationBlocker(message_center)));
+      base::MakeUnique<FullscreenNotificationBlocker>(message_center));
 
 #if defined(OS_WIN) || defined(OS_MACOSX) \
   || (defined(OS_LINUX) && !defined(OS_CHROMEOS))
   // On Windows, Linux and Mac, the notification manager owns the tray icon and
   // views.Other platforms have global ownership and Create will return NULL.
   tray_.reset(message_center::CreateMessageCenterTray());
 #endif
 }
 
 MessageCenterNotificationManager::~MessageCenterNotificationManager() {
@@ skipping 31 matching lines @@
   // Change it to send notifications to message center only when the user chose
   // default message center (extension_id.empty()).
 
   // If there exist apps/extensions that have notificationProvider permission,
   // route notifications to one of the apps/extensions.
   std::string extension_id = GetExtensionTakingOverNotifications(profile);
   if (!extension_id.empty())
     AddNotificationToAlternateProvider(profile_notification->notification(),
                                        profile, extension_id);
 
-  message_center_->AddNotification(base::WrapUnique(
-      new message_center::Notification(profile_notification->notification())));
+  message_center_->AddNotification(
+      base::MakeUnique<message_center::Notification>(
+          profile_notification->notification()));
 }
 
 bool MessageCenterNotificationManager::Update(const Notification& notification,
                                               Profile* profile) {
   const std::string& tag = notification.tag();
   if (tag.empty())
     return false;
 
   const GURL origin_url = notification.origin_url();
   DCHECK(origin_url.is_valid());
@@ skipping 23 matching lines @@
       profile_notifications_[new_notification->notification().id()] =
           new_notification;
 
       // TODO(liyanhou): Add routing updated notifications to alternative
       // providers.
 
       // WARNING: You MUST use AddProfileNotification or update the message
       // center via the notification within a ProfileNotification object or the
       // profile ID will not be correctly set for ChromeOS.
       message_center_->UpdateNotification(
-          old_id, base::WrapUnique(new message_center::Notification(
-                      new_notification->notification())));
+          old_id, base::MakeUnique<message_center::Notification>(
+                      new_notification->notification()));
 
       return true;
     }
   }
   return false;
 }
 
 const Notification* MessageCenterNotificationManager::FindById(
     const std::string& delegate_id,
     ProfileID profile_id) const {
@@ skipping 203 matching lines @@
        it != registry->enabled_extensions().end();
        ++it) {
     if ((*it->get()).permissions_data()->HasAPIPermission(
             extensions::APIPermission::ID::kNotificationProvider)) {
       extension_id = (*it->get()).id();
       return extension_id;
     }
   }
   return extension_id;
 }