Move session length timer into tray bubble.

ash/system/chromeos/session/tray_session_length_limit_unittest.cc

 // Copyright 2014 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 "ash/system/chromeos/session/tray_session_length_limit.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 48 matching lines @@
 
   void RemoveNotification() {
     message_center::MessageCenter::Get()->RemoveNotification(
         TraySessionLengthLimit::kNotificationId, true /* by_user */);
   }
 
   TraySessionLengthLimit* tray_session_length_limit() {
     return tray_session_length_limit_;
   }
 
-  bool IsTrayViewVisible() {
-    return tray_session_length_limit_->IsTrayViewVisibleForTest();
-  }
-
  private:
   // Weak reference, owned by the SystemTray.
   TraySessionLengthLimit* tray_session_length_limit_;
 
   DISALLOW_COPY_AND_ASSIGN(TraySessionLengthLimitTest);
 };
 
-TEST_F(TraySessionLengthLimitTest, TrayView) {
-  // No session limit.
-  EXPECT_FALSE(IsTrayViewVisible());

[bartfab (slow), 2014/05/05 13:45:04]

Is it not possible whether the new bubble view is visible or not? Otherwise, we
are losing test coverage.

[Thiemo Nagel, 2014/05/05 14:48:41]

I plan to look at that once the current CL has landed and submit it as a 2nd CL,
possibly together with string updates from the UX team.

-
-  // Limit is 15 min.
-  UpdateSessionLengthLimitInMin(15);
-  EXPECT_EQ(TraySessionLengthLimit::LIMIT_SET,
-            tray_session_length_limit()->GetLimitState());
-  EXPECT_TRUE(IsTrayViewVisible());
-
-  // Limit is 3 min.
-  UpdateSessionLengthLimitInMin(3);
-  EXPECT_EQ(TraySessionLengthLimit::LIMIT_EXPIRING_SOON,
-            tray_session_length_limit()->GetLimitState());
-  EXPECT_TRUE(IsTrayViewVisible());
-
-  // Nothing left.
-  UpdateSessionLengthLimitInMin(0);
-  EXPECT_EQ(TraySessionLengthLimit::LIMIT_EXPIRING_SOON,
-            tray_session_length_limit()->GetLimitState());
-  EXPECT_TRUE(IsTrayViewVisible());
-
-  // Checks the behavior in case the limit goes negative.
-  UpdateSessionLengthLimitInMin(-5);
-  EXPECT_EQ(TraySessionLengthLimit::LIMIT_EXPIRING_SOON,
-            tray_session_length_limit()->GetLimitState());
-  EXPECT_TRUE(IsTrayViewVisible());
-
-  // Clears the session length limit, the TrayView should get invisible.
-  ClearSessionLengthLimit();
-  ASSERT_EQ(TraySessionLengthLimit::LIMIT_NONE,
-            tray_session_length_limit()->GetLimitState());
-  EXPECT_FALSE(IsTrayViewVisible());
-}
-
 TEST_F(TraySessionLengthLimitTest, Notification) {
   // No notifications when no session limit.
   EXPECT_FALSE(GetNotification());
 
   // Limit is 15 min.
   UpdateSessionLengthLimitInMin(15);
   message_center::Notification* notification = GetNotification();
   EXPECT_TRUE(notification);
   EXPECT_EQ(message_center::SYSTEM_PRIORITY, notification->priority());
-  base::string16 first_content = notification->title();
+  base::string16 first_content = notification->message();
   // Should read the content.
   EXPECT_TRUE(notification->rich_notification_data().
               should_make_spoken_feedback_for_popup_updates);
 
   // Limit is 10 min.
   UpdateSessionLengthLimitInMin(10);
   notification = GetNotification();
   EXPECT_TRUE(notification);
   EXPECT_EQ(message_center::SYSTEM_PRIORITY, notification->priority());
   // The content should be updated.
-  EXPECT_NE(first_content, notification->title());
+  EXPECT_NE(first_content, notification->message());
   // Should NOT read, because just update the remaining time.
   EXPECT_FALSE(notification->rich_notification_data().
                should_make_spoken_feedback_for_popup_updates);
 
   // Limit is 3 min.
   UpdateSessionLengthLimitInMin(3);
   notification = GetNotification();
   EXPECT_TRUE(notification);
   EXPECT_EQ(message_center::SYSTEM_PRIORITY, notification->priority());
   // Should read the content again because the state has changed.
   EXPECT_TRUE(notification->rich_notification_data().
               should_make_spoken_feedback_for_popup_updates);
 
   // Session length limit is updated to longer. This should not read the

[bartfab (slow), 2014/05/05 13:45:04]

Nit: Update to reflect the updated comment below.

[Thiemo Nagel, 2014/05/05 14:48:41]

Done.

   // notification content again.
   UpdateSessionLengthLimitInMin(15);
   notification = GetNotification();
   EXPECT_TRUE(notification);
   EXPECT_EQ(message_center::SYSTEM_PRIORITY, notification->priority());
-  // Should not read again because the state has changed to longer.
-  EXPECT_FALSE(notification->rich_notification_data().
-               should_make_spoken_feedback_for_popup_updates);
+  // Should read again because an increase of the remaining time is noteworthy.
+  EXPECT_TRUE(notification->rich_notification_data().
+              should_make_spoken_feedback_for_popup_updates);
 
   // Clears the limit: the notification should be gone.
   ClearSessionLengthLimit();
   EXPECT_FALSE(GetNotification());
 }
 
 TEST_F(TraySessionLengthLimitTest, RemoveNotification) {
+  message_center::Notification* notification;
+
   // Limit is 15 min.
   UpdateSessionLengthLimitInMin(15);
   EXPECT_TRUE(GetNotification());
 
-  // Limit is 14 min.
-  UpdateSessionLengthLimitInMin(14);

[bartfab (slow), 2014/05/05 13:45:04]

Does the notifcation disappear now if the limit is shortened? Or why did you
remove this part of the test?

[Thiemo Nagel, 2014/05/05 14:48:41]

No, it doesn't.  It's just that I consider this test obsolete as
TraySessionLengthLimitTest.Notification already includes a change 15min -->
10min.

-  EXPECT_TRUE(GetNotification());
-
   // Removes the notification.
   RemoveNotification();
   EXPECT_FALSE(GetNotification());
 
-  // Limit is 13 min. The notification should not re-appear.
-  UpdateSessionLengthLimitInMin(13);
+  // Limit is 10 min. The notification should not re-appear.
+  UpdateSessionLengthLimitInMin(10);
   EXPECT_FALSE(GetNotification());
 
-  // Limit is 3 min. The notification should re-appear because of state change.
+  // Limit is 3 min. The notification should re-appear and should be re-read
+  // because of state change.
   UpdateSessionLengthLimitInMin(3);
-  EXPECT_TRUE(GetNotification());
+  notification = GetNotification();
+  EXPECT_TRUE(notification);
+  EXPECT_TRUE(notification->rich_notification_data().
+              should_make_spoken_feedback_for_popup_updates);
 
   RemoveNotification();
 
-  // Session length limit is updated to longer state. This should not re-appear
-  // the notification.
+  // Session length limit is updated to longer state. Notification should
+  // re-appear and be re-read.
   UpdateSessionLengthLimitInMin(15);
-  EXPECT_FALSE(GetNotification());
+  EXPECT_TRUE(notification);
+  EXPECT_TRUE(notification->rich_notification_data().
+              should_make_spoken_feedback_for_popup_updates);
 }
 
 }  // namespace test
 }  // namespace ash