Merge 98618 - [chromeos] Do not move notifications to KEEP_SIZE state when mouse moved.

chrome/browser/chromeos/notifications/notification_browsertest.cc

Index: chrome/browser/chromeos/notifications/notification_browsertest.cc
===================================================================
--- chrome/browser/chromeos/notifications/notification_browsertest.cc	(revision 98799)
+++ chrome/browser/chromeos/notifications/notification_browsertest.cc	(working copy)
@@ -174,8 +174,9 @@
   ui_test_utils::RunAllPendingInMessageLoop();
 }
 
-// [CLOSED] -add->[STICKY_AND_NEW] -mouse-> [KEEP_SIZE] -remove/add->
-// [KEEP_SIZE] -remove-> [CLOSED] -add-> [STICKY_AND_NEW] -remove-> [CLOSED]
+// [CLOSED] -add->[STICKY_AND_NEW] -mouse-> [STICKY_AND_NEW] -remove/add->
+// [STICKY_AND_NEW] -remove-> [CLOSED] -add-> [STICKY_AND_NEW] -remove->
+// [CLOSED]
 IN_PROC_BROWSER_TEST_F(NotificationTest, TestKeepSizeState) {
   BalloonCollectionImpl* collection = GetBalloonCollectionImpl();
   NotificationPanel* panel = GetNotificationPanel();
@@ -190,25 +191,25 @@
   EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   panel->OnMouseMotion(gfx::Point(10, 10));
-  EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+  EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->RemoveById("1");
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, tester->GetNewNotificationCount());
   EXPECT_EQ(1, tester->GetNotificationCount());
-  EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+  EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->Add(NewMockNotification("1"), browser()->profile());
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(2, tester->GetNewNotificationCount());
   EXPECT_EQ(2, tester->GetNotificationCount());
-  EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+  EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->RemoveById("1");
   ui_test_utils::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, tester->GetNewNotificationCount());
   EXPECT_EQ(1, tester->GetNotificationCount());
-  EXPECT_EQ(NotificationPanel::KEEP_SIZE, tester->state());
+  EXPECT_EQ(NotificationPanel::STICKY_AND_NEW, tester->state());
 
   collection->RemoveById("2");
   ui_test_utils::RunAllPendingInMessageLoop();