Convert Pass()→std::move() in ui/

ui/message_center/message_center_impl_unittest.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 "ui/message_center/message_center_impl.h"
 
+#include <utility>
+
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/message_center_types.h"
 #include "ui/message_center/notification_blocker.h"
@@ skipping 593 matching lines @@
 
 TEST_F(MessageCenterImplTest, ForceNotificationFlush_InconsistentUpdate) {
   std::string id1("id1");
   std::string id2("id2");
   std::string id3("id3");
 
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Add -> Update (with ID change)
   scoped_ptr<Notification> notification(CreateSimpleNotification(id1));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->UpdateNotification(id1, notification.Pass());
+  message_center()->UpdateNotification(id1, std::move(notification));
 
   // Add (although the same ID exists) -> Update (with ID change) -> Remove
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id3));
-  message_center()->UpdateNotification(id2, notification.Pass());
+  message_center()->UpdateNotification(id2, std::move(notification));
   message_center()->RemoveNotification(id3, false);
 
   // Remove (although the ID has already removed)
   message_center()->RemoveNotification(id3, false);
 
   // Notification is not added since the message center has opened.
   ASSERT_EQ(0u, message_center()->NotificationCount());
 
   // Forced to update.
   ForceNotificationFlush(id3);
@@ skipping 82 matching lines @@
 }
 
 TEST_F(MessageCenterImplTestWithChangeQueue, QueueUpdatesWithCenterVisible) {
   std::string id("id1");
   std::string id2("id2");
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   // First, add and update a notification to ensure updates happen
   // normally.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->UpdateNotification(id, notification.Pass());
+  message_center()->UpdateNotification(id, std::move(notification));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; nothing should have happened.
   notification.reset(CreateSimpleNotification(id));
-  message_center()->UpdateNotification(id2, notification.Pass());
+  message_center()->UpdateNotification(id2, std::move(notification));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Close the message center; then the update should have propagated.
   message_center()->SetVisibility(VISIBILITY_TRANSIENT);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 }
 
 TEST_F(MessageCenterImplTestWithChangeQueue, ComplexQueueing) {
   std::string ids[6] = {"0", "1", "2", "3", "4p", "5"};
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   scoped_ptr<Notification> notification;
   // Add some notifications
   int i = 0;
   for (; i < 3; i++) {
     notification.reset(CreateSimpleNotification(ids[i]));
-    message_center()->AddNotification(notification.Pass());
+    message_center()->AddNotification(std::move(notification));
   }
   for (i = 0; i < 3; i++) {
     EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[i]));
   }
   for (; i < 6; i++) {
     EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[i]));
   }
 
   notification.reset(CreateNotification(ids[4], NOTIFICATION_TYPE_PROGRESS));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   // Now start queueing.
   // NL: ["0", "1", "2", "4p"]
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // This should update notification "1" to have id "3".
   notification.reset(CreateSimpleNotification(ids[3]));
-  message_center()->UpdateNotification(ids[1], notification.Pass());
+  message_center()->UpdateNotification(ids[1], std::move(notification));
 
   // Change the ID: "4p" -> "5", "5" -> "1", "1" -> "4p". They shouldn't
   // override the previous change ("1" -> "3") nor the next one ("3" -> "5").
   notification.reset(CreateSimpleNotification(ids[5]));
-  message_center()->UpdateNotification(ids[4], notification.Pass());
+  message_center()->UpdateNotification(ids[4], std::move(notification));
   notification.reset(CreateSimpleNotification(ids[1]));
-  message_center()->UpdateNotification(ids[5], notification.Pass());
+  message_center()->UpdateNotification(ids[5], std::move(notification));
   notification.reset(CreateNotification(ids[4], NOTIFICATION_TYPE_PROGRESS));
-  message_center()->UpdateNotification(ids[1], notification.Pass());
+  message_center()->UpdateNotification(ids[1], std::move(notification));
 
   // This should update notification "3" to "5" after we go TRANSIENT.
   notification.reset(CreateSimpleNotification(ids[5]));
-  message_center()->UpdateNotification(ids[3], notification.Pass());
+  message_center()->UpdateNotification(ids[3], std::move(notification));
 
   // This should create a new "3", that doesn't overwrite the update to 3
   // before.
   notification.reset(CreateSimpleNotification(ids[3]));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   // The NL should still be the same: ["0", "1", "2", "4p"]
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[0]));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[1]));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[2]));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[3]));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[4]));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[5]));
   EXPECT_EQ(message_center()->GetVisibleNotifications().size(), 4u);
   message_center()->SetVisibility(VISIBILITY_TRANSIENT);
@@ skipping 11 matching lines @@
   std::string ids[11] =
       {"0", "1", "2", "3", "4", "5", "6", "7", "8", "9", "10p"};
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   scoped_ptr<Notification> notification;
   // Add some notifications
   int i = 0;
   for (; i < 6; i++) {
     notification.reset(CreateSimpleNotification(ids[i]));
     notification->set_title(base::ASCIIToUTF16("ORIGINAL TITLE"));
-    message_center()->AddNotification(notification.Pass());
+    message_center()->AddNotification(std::move(notification));
   }
   for (i = 0; i < 6; i++) {
     EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[i]));
   }
   for (; i < 8; i++) {
     EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[i]));
   }
 
   notification.reset(CreateNotification(ids[10], NOTIFICATION_TYPE_PROGRESS));
   notification->set_progress(10);
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   // Now start queueing.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Notification 0: (Exists) -> Removed
   message_center()->RemoveNotification(ids[0], false);
 
   // Notification 1: (Exists) -> Removed (by user)
   message_center()->RemoveNotification(ids[1], true);  // removed immediately
 
   // Notification 2: (Exists) -> Removed -> Added
   message_center()->RemoveNotification(ids[2], false);
   notification.reset(CreateSimpleNotification(ids[2]));
   notification->set_title(base::ASCIIToUTF16("NEW TITLE 2"));
-  message_center()->UpdateNotification(ids[2], notification.Pass());
+  message_center()->UpdateNotification(ids[2], std::move(notification));
 
   // Notification 3: (Exists) -> Removed -> Updated
   message_center()->RemoveNotification(ids[3], false);
   notification.reset(CreateSimpleNotification(ids[3]));
   notification->set_title(base::ASCIIToUTF16("NEW TITLE 3"));
-  message_center()->UpdateNotification(ids[3], notification.Pass());
+  message_center()->UpdateNotification(ids[3], std::move(notification));
 
   // Notification 4: (Exists) -> Removed -> Added -> Removed
   message_center()->RemoveNotification(ids[4], false);
   notification.reset(CreateSimpleNotification(ids[4]));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   message_center()->RemoveNotification(ids[4], false);
 
   // Notification 5: (Exists) -> Updated
   notification.reset(CreateSimpleNotification(ids[5]));
   notification->set_title(base::ASCIIToUTF16("NEW TITLE 5"));
-  message_center()->UpdateNotification(ids[5], notification.Pass());
+  message_center()->UpdateNotification(ids[5], std::move(notification));
 
   // Notification 6: Updated
   notification.reset(CreateSimpleNotification(ids[6]));
-  message_center()->UpdateNotification(ids[6], notification.Pass());
+  message_center()->UpdateNotification(ids[6], std::move(notification));
 
   // Notification 7: Updated -> Removed
   notification.reset(CreateSimpleNotification(ids[7]));
-  message_center()->UpdateNotification(ids[7], notification.Pass());
+  message_center()->UpdateNotification(ids[7], std::move(notification));
   message_center()->RemoveNotification(ids[7], false);
 
   // Notification 8: Added -> Updated
   notification.reset(CreateSimpleNotification(ids[8]));
   notification->set_title(base::ASCIIToUTF16("UPDATING 8-1"));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(ids[8]));
   notification->set_title(base::ASCIIToUTF16("NEW TITLE 8"));
-  message_center()->UpdateNotification(ids[8], notification.Pass());
+  message_center()->UpdateNotification(ids[8], std::move(notification));
 
   // Notification 9: Added -> Updated -> Removed
   notification.reset(CreateSimpleNotification(ids[9]));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(ids[9]));
-  message_center()->UpdateNotification(ids[9], notification.Pass());
+  message_center()->UpdateNotification(ids[9], std::move(notification));
   message_center()->RemoveNotification(ids[9], false);
 
   // Notification 10 (TYPE_PROGRESS): Updated -> Removed -> Added -> Updated
   // Step 1) Progress is updated immediately before removed.
   notification.reset(CreateNotification(ids[10], NOTIFICATION_TYPE_PROGRESS));
   notification->set_progress(20);
-  message_center()->UpdateNotification(ids[10], notification.Pass());
+  message_center()->UpdateNotification(ids[10], std::move(notification));
   EXPECT_EQ(20,
             message_center()->FindVisibleNotificationById(ids[10])->progress());
   message_center()->RemoveNotification(ids[10], false);
   // Step 2) Progress isn't updated after removed.
   notification.reset(CreateSimpleNotification(ids[10]));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   EXPECT_EQ(20,
             message_center()->FindVisibleNotificationById(ids[10])->progress());
   notification.reset(CreateSimpleNotification(ids[10]));
   notification->set_progress(40);
-  message_center()->UpdateNotification(ids[10], notification.Pass());
+  message_center()->UpdateNotification(ids[10], std::move(notification));
   EXPECT_EQ(20,
             message_center()->FindVisibleNotificationById(ids[10])->progress());
 
   // All changes except the notification 1 and 10 are not refrected.
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[0]));
   EXPECT_EQ(base::ASCIIToUTF16("ORIGINAL TITLE"),
             message_center()->FindVisibleNotificationById(ids[0])->title());
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(ids[1]));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(ids[2]));
   EXPECT_EQ(base::ASCIIToUTF16("ORIGINAL TITLE"),
@@ skipping 55 matching lines @@
 
   // Double-check that sizes all match.
   const std::vector<ButtonInfo>& original_buttons = notification->buttons();
   ASSERT_EQ(2u, original_buttons.size());
 
   EXPECT_EQ(original_size, notification->icon().Size());
   EXPECT_EQ(original_size, notification->image().Size());
   EXPECT_EQ(original_size, original_buttons[0].icon.Size());
   EXPECT_EQ(original_size, original_buttons[1].icon.Size());
 
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   // The notification should be in the queue.
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Now try setting the icon to a different size.
   gfx::Size new_size(16, 16);
   EXPECT_NE(original_size, new_size);
 
   gfx::Canvas canvas(new_size, 1.0f, true);
   canvas.DrawColor(SK_ColorBLUE);
@@ skipping 36 matching lines @@
   // Notification is added.
   ASSERT_EQ(1u, message_center()->NotificationCount());
 }
 
 
 TEST_F(MessageCenterImplTestWithChangeQueue, ForceNotificationFlushUpdate) {
   std::string id("id1");
   std::string id2("id2");
 
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->UpdateNotification(id, notification.Pass());
+  message_center()->UpdateNotification(id, std::move(notification));
 
   // Nothing is changed.
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 
   // Forced to update ID1.
   ForceNotificationFlush(id);
 
   // Nothing is changed, since the ID is changed.
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 
   // Forced to update ID2.
   ForceNotificationFlush(id2);
 
   // The ID is changed.
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Makes sure if there is only one notification.
   ASSERT_EQ(1u, message_center()->NotificationCount());
 }
 
 TEST_F(MessageCenterImplTestWithChangeQueue, ForceNotificationFlushRemove) {
   std::string id("id1");
 
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
 
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
   message_center()->RemoveNotification(id, false);
 
   // Notification is not removed yet.
   ASSERT_EQ(1u, message_center()->NotificationCount());
 
   // Forced to update.
   ForceNotificationFlush(id);
 
   // Notification is removed.
   ASSERT_EQ(0u, message_center()->NotificationCount());
 }
 
 TEST_F(MessageCenterImplTestWithChangeQueue,
        ForceNotificationFlush_ComplexUpdate) {
   std::string id1("id1");
   std::string id2("id2");
   std::string id3("id3");
 
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Add -> Update (with ID change) -> Remove
   scoped_ptr<Notification> notification(CreateSimpleNotification(id1));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->UpdateNotification(id1, notification.Pass());
+  message_center()->UpdateNotification(id1, std::move(notification));
   message_center()->RemoveNotification(id2, false);
 
   // Add -> Update (with ID change)
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id3));
-  message_center()->UpdateNotification(id2, notification.Pass());
+  message_center()->UpdateNotification(id2, std::move(notification));
 
   // Notification is not added since the message center has opened.
   ASSERT_EQ(0u, message_center()->NotificationCount());
 
   // Forced to update.
   ForceNotificationFlush(id3);
 
   // Confirms the chagnes are applied.
   ASSERT_EQ(1u, message_center()->NotificationCount());
 }
 
 TEST_F(MessageCenterImplTestWithoutChangeQueue,
        UpdateWhileMessageCenterVisible) {
   std::string id("id1");
   std::string id2("id2");
   NotifierId notifier_id1(NotifierId::APPLICATION, "app1");
 
   // First, add and update a notification to ensure updates happen
   // normally.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   notification.reset(CreateSimpleNotification(id2));
-  message_center()->UpdateNotification(id, notification.Pass());
+  message_center()->UpdateNotification(id, std::move(notification));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   notification.reset(CreateSimpleNotification(id));
-  message_center()->UpdateNotification(id2, notification.Pass());
+  message_center()->UpdateNotification(id2, std::move(notification));
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id2));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 }
 
 TEST_F(MessageCenterImplTestWithoutChangeQueue, AddWhileMessageCenterVisible) {
   std::string id("id1");
 
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Add a notification and confirm the adding should have propagated.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 }
 
 TEST_F(MessageCenterImplTestWithoutChangeQueue,
        RemoveWhileMessageCenterVisible) {
   std::string id("id1");
 
   // First, add a notification to ensure updates happen normally.
   scoped_ptr<Notification> notification(CreateSimpleNotification(id));
-  message_center()->AddNotification(notification.Pass());
+  message_center()->AddNotification(std::move(notification));
   EXPECT_TRUE(message_center()->FindVisibleNotificationById(id));
 
   // Then open the message center.
   message_center()->SetVisibility(VISIBILITY_MESSAGE_CENTER);
 
   // Then update a notification; the update should have propagated.
   message_center()->RemoveNotification(id, false);
   EXPECT_FALSE(message_center()->FindVisibleNotificationById(id));
 }
 
 }  // namespace internal
 }  // namespace message_center