Notificaiton Message for Unified mode

ash/system/chromeos/tray_display_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 "ash/system/chromeos/tray_display.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
@@ skipping 63 matching lines @@
 class TrayDisplayTest : public ash::test::AshTestBase {
  public:
   TrayDisplayTest();
   ~TrayDisplayTest() override;
 
   void SetUp() override;
 
  protected:
   SystemTray* tray() { return tray_; }
   TrayDisplay* tray_display() { return tray_display_; }
+  void UpdateTray();
 
   void CloseNotification();
   bool IsDisplayVisibleInTray() const;
   base::string16 GetTrayDisplayText() const;
   void CheckAccessibleName() const;
   base::string16 GetTrayDisplayTooltipText() const;
   base::string16 GetDisplayNotificationText() const;
   base::string16 GetDisplayNotificationAdditionalText() const;
 
  private:
   const message_center::Notification* GetDisplayNotification() const;
 
   // Weak reference, owned by Shell.
   SystemTray* tray_;
 
   // Weak reference, owned by |tray_|.
   TrayDisplay* tray_display_;
 
   DISALLOW_COPY_AND_ASSIGN(TrayDisplayTest);
 };
 
 TrayDisplayTest::TrayDisplayTest() : tray_(NULL), tray_display_(NULL) {
 }
 
 TrayDisplayTest::~TrayDisplayTest() {
 }
 
 void TrayDisplayTest::SetUp() {
   ash::test::AshTestBase::SetUp();
+  UpdateTray();
+}
+
+void TrayDisplayTest::UpdateTray() {
   tray_ = Shell::GetPrimaryRootWindowController()->GetSystemTray();
   tray_display_ = new TrayDisplay(tray_);
   tray_->AddTrayItem(tray_display_);
 }
 
 void TrayDisplayTest::CloseNotification() {
   message_center::MessageCenter::Get()->RemoveNotification(
       TrayDisplay::kNotificationId, false);
   RunAllPendingInMessageLoop();
 }
@@ skipping 161 matching lines @@
   UpdateDisplay("400x400@1.5");
   tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_TRUE(IsDisplayVisibleInTray());
   expected = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED);
   EXPECT_EQ(expected, GetTrayDisplayText());
   EXPECT_EQ(
       GetTooltipText(
           expected, GetFirstDisplayName(), "600x600", base::string16(), ""),
       GetTrayDisplayTooltipText());
   CheckAccessibleName();
+
+  // Unified mode
+  display_manager->SetDefaultMultiDisplayMode(DisplayManager::UNIFIED);
+  display_manager->SetMultiDisplayMode(DisplayManager::UNIFIED);
+  UpdateDisplay("300x200,400x500");
+  // Update the cache variables as the primary root window changed.
+  UpdateTray();

[Jun Mukai, 2015/05/13 18:03:49]

Resetting the variable explicitly from a test case doesn't look fun and robust.
Can TrayDisplayTest inherit DisplayObserver and refresh the variables at primary
display's destruction?

+  tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
+  EXPECT_TRUE(IsDisplayVisibleInTray());
+  expected = l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_UNIFIED);
+  EXPECT_EQ(expected, GetTrayDisplayText());
 }
 
 TEST_F(TrayDisplayTest, ExternalDisplayResized) {
   UpdateDisplay("400x400");
   DisplayManager* display_manager = Shell::GetInstance()->display_manager();
   gfx::Display::SetInternalDisplayId(display_manager->first_display_id());
 
   // Shows the tray_display even though there's a single-display.
   tray()->ShowDefaultView(BUBBLE_USE_EXISTING);
   EXPECT_FALSE(IsDisplayVisibleInTray());
@@ skipping 253 matching lines @@
   // rotate the second.
   UpdateDisplay("400x400,200x200/r");
   EXPECT_EQ(l10n_util::GetStringFUTF16(
                 IDS_ASH_STATUS_TRAY_DISPLAY_ROTATED, GetSecondDisplayName(),
                 l10n_util::GetStringUTF16(
                     IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
             GetDisplayNotificationAdditionalText());
 }
 
 }  // namespace ash