Remove docked-mode notification

ash/system/chromeos/screen_layout_observer_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/screen_layout_observer.h"
 
 #include "ash/common/system/chromeos/devicetype_utils.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/test/test_system_tray_delegate.h"
 #include "ash/shell.h"
@@ skipping 183 matching lines @@
                 l10n_util::GetStringUTF16(
                     IDS_ASH_STATUS_TRAY_DISPLAY_ORIENTATION_90)),
             GetDisplayNotificationAdditionalText());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 
   // Enters closed lid mode.
   UpdateDisplay("400x400@1.5,200x200");
   display::Display::SetInternalDisplayId(
       display_manager()->GetSecondaryDisplay().id());
   UpdateDisplay("400x400@1.5");
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
-            GetDisplayNotificationText());
-  EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
-                IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
-            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
 }
 
 // Verify that notification shows up when display is switched from dock mode to
 // extend mode.
 TEST_F(ScreenLayoutObserverTest, DisplayConfigurationChangedTwice) {
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   EXPECT_EQ(l10n_util::GetStringUTF16(
@@ skipping 48 matching lines @@
   EXPECT_TRUE(GetDisplayNotificationText().empty());
   EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
 
   // Reset the overscan.
   Shell::GetInstance()->display_manager()->SetOverscanInsets(
       display_manager()->GetSecondaryDisplay().id(), gfx::Insets());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
   EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
 }
 
-// Tests that exiting mirror mode by closing the lid shows the correct "docked
-// mode" message.
+// Tests that exiting mirror mode by closing the lid shows the correct "exiting
+// mirror mode" message.
 TEST_F(ScreenLayoutObserverTest, ExitMirrorModeBecauseOfDockedModeMessage) {
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   display::Display::SetInternalDisplayId(
       display_manager()->GetSecondaryDisplay().id());
 
   // Mirroring.
   display_manager()->SetSoftwareMirroring(true);
   UpdateDisplay("400x400,200x200");
   EXPECT_EQ(l10n_util::GetStringFUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_MIRRORING,
                                        GetMirroringDisplayName()),
             GetDisplayNotificationText());
 
   // Docked.
   CloseNotification();
   display_manager()->SetSoftwareMirroring(false);
   display::Display::SetInternalDisplayId(display_manager()->first_display_id());
   UpdateDisplay("200x200");
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
+  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_MIRROR_EXIT),
             GetDisplayNotificationText());
-  EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
-                IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
-            GetDisplayNotificationAdditionalText());
 }
 
 // Tests that exiting mirror mode because of adding a third display shows the
 // correct "3+ displays mirror mode is not supported" message.
 TEST_F(ScreenLayoutObserverTest, ExitMirrorModeBecauseOfThirdDisplayMessage) {
   Shell::GetInstance()
       ->screen_layout_observer()
       ->set_show_notifications_for_testing(true);
   UpdateDisplay("400x400,200x200");
   display::Display::SetInternalDisplayId(
@@ skipping 120 matching lines @@
 
   const int64_t primary_id = display_manager()->GetDisplayAt(0).id();
   const int64_t internal_secondary_id = display_manager()->GetDisplayAt(1).id();
   display::Display::SetInternalDisplayId(internal_secondary_id);
   display::DisplayLayoutBuilder builder(primary_id);
   builder.AddDisplayPlacement(internal_secondary_id, primary_id,
                               display::DisplayPlacement::LEFT, 0);
   display_manager()->SetLayoutForCurrentDisplays(builder.Build());
   EXPECT_TRUE(GetDisplayNotificationText().empty());
 
-  // Close the lid and expect we show the docked mode message.
+  // Close the lid. We go to docked mode, but we show no notifications.
   UpdateDisplay("400x400");
-  EXPECT_EQ(l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED),
-            GetDisplayNotificationText());
-  EXPECT_EQ(ash::SubstituteChromeOSDeviceType(
-                IDS_ASH_STATUS_TRAY_DISPLAY_DOCKED_DESCRIPTION),
-            GetDisplayNotificationAdditionalText());
+  EXPECT_TRUE(GetDisplayNotificationText().empty());
+  EXPECT_TRUE(GetDisplayNotificationAdditionalText().empty());
 }
 
 }  // namespace ash