ash: Fix crash in launcher tooltip manager

ash/launcher/launcher_view_unittest.cc

 // Copyright (c) 2012 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/launcher/launcher_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/ash_switches.h"
@@ skipping 1065 matching lines @@
   tooltip_manager->Close();
 
   // Next time: enter app_button -> move immediately to tab_button.
   button_host->MouseEnteredButton(app_button);
   button_host->MouseExitedButton(app_button);
   button_host->MouseEnteredButton(platform_button);
   EXPECT_FALSE(tooltip_manager->IsVisible());
   EXPECT_EQ(platform_button, GetTooltipAnchorView());
 }
 
+// Verify a fix for crash caused by a tooltip update for a deleted launcher
+// button, see crbug.com/288838.
+TEST_F(LauncherViewTest, RemovingItemClosesTooltip) {

[James Cook, 2013/09/13 23:54:09]

This test, without the other patches, reproduces the call stack in the crash
report.

[Mr4D (OOO till 08-26), 2013/09/14 00:06:21]

Very nice! 

+  internal::LauncherButtonHost* button_host = launcher_view_;
+  internal::LauncherTooltipManager* tooltip_manager =
+      launcher_view_->tooltip_manager();
+
+  // Add an item to the launcher.
+  LauncherID app_button_id = AddAppShortcut();
+  internal::LauncherButton* app_button = GetButtonByID(app_button_id);
+
+  // Spawn a tooltip on that item.
+  button_host->MouseEnteredButton(app_button);
+  ShowTooltip();
+  EXPECT_TRUE(tooltip_manager->IsVisible());
+
+  // Remove the app shortcut while the tooltip is open. The tooltip should be
+  // closed.
+  RemoveByID(app_button_id);
+  EXPECT_FALSE(tooltip_manager->IsVisible());
+
+  // Change the shelf layout. This should not crash.
+  ash::Shell::GetInstance()->SetShelfAlignment(
+      ash::SHELF_ALIGNMENT_LEFT,
+      ash::Shell::GetPrimaryRootWindow());
+}
+
+// Changing the shelf alignment closes any open tooltip.
+TEST_F(LauncherViewTest, ShelfAlignmentClosesTooltip) {
+  internal::LauncherButtonHost* button_host = launcher_view_;
+  internal::LauncherTooltipManager* tooltip_manager =
+      launcher_view_->tooltip_manager();
+
+  // Add an item to the launcher.
+  LauncherID app_button_id = AddAppShortcut();
+  internal::LauncherButton* app_button = GetButtonByID(app_button_id);
+
+  // Spawn a tooltip on the item.
+  button_host->MouseEnteredButton(app_button);
+  ShowTooltip();
+  EXPECT_TRUE(tooltip_manager->IsVisible());
+
+  // Changing shelf alignment hides the tooltip.
+  ash::Shell::GetInstance()->SetShelfAlignment(
+      ash::SHELF_ALIGNMENT_LEFT,
+      ash::Shell::GetPrimaryRootWindow());
+  EXPECT_FALSE(tooltip_manager->IsVisible());
+}
+
 TEST_F(LauncherViewTest, ShouldHideTooltipTest) {
   LauncherID app_button_id = AddAppShortcut();
   LauncherID platform_button_id = AddPlatformApp();
 
   // The tooltip shouldn't hide if the mouse is on normal buttons.
   for (int i = 0; i < test_api_->GetButtonCount(); i++) {
     internal::LauncherButton* button = test_api_->GetButton(i);
     if (!button)
       continue;
 
@@ skipping 145 matching lines @@
             test_api_->GetButtonCount());
   gfx::Rect ideal_bounds_0 = test_api_->GetIdealBoundsByIndex(0);
   gfx::Rect ideal_bounds_1 = test_api_->GetIdealBoundsByIndex(1);
   EXPECT_GT(ideal_bounds_0.width(), ideal_bounds_1.width());
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl, LauncherViewTextDirectionTest, testing::Bool());
 
 }  // namespace test
 }  // namespace ash