Fixes possible crash if the window hosting a menu was closed while the

chrome/browser/views/bookmark_bar_view_test.cc

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "base/keyboard_codes.h"
 #include "base/string_util.h"
 #include "chrome/browser/automation/ui_controls.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/page_navigator.h"
 #include "chrome/browser/views/bookmark_bar_view.h"
 #include "chrome/common/notification_service.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/testing_profile.h"
 #include "chrome/test/interactive_ui/view_event_test_base.h"
 #include "chrome/test/ui_test_utils.h"
 #include "grit/generated_resources.h"
 #include "views/controls/button/menu_button.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/controls/menu/submenu_view.h"
+#include "views/views_delegate.h"
 #include "views/window/window.h"
 
 #if defined(OS_LINUX)
 // See http://crbug.com/40040 for details.
 #define MAYBE_DND DISABLED_DND
 #define MAYBE_DNDToDifferentMenu DISABLED_DNDToDifferentMenu
 #define MAYBE_DNDBackToOriginatingMenu DISABLED_DNDBackToOriginatingMenu
 
 // See http://crbug.com/40039 for details.
 #define MAYBE_KeyEvents DISABLED_KeyEvents
 
 #else
 
 #define MAYBE_DND DND
 #define MAYBE_DNDToDifferentMenu DNDToDifferentMenu
 #define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
 #define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
 #define MAYBE_KeyEvents KeyEvents
 
 #endif
 
 namespace {
 
+class ViewsDelegateImpl : public views::ViewsDelegate {
+ public:
+  ViewsDelegateImpl() {}
+  virtual Clipboard* GetClipboard() const { return NULL; }
+  virtual void SaveWindowPlacement(const std::wstring& window_name,
+                                   const gfx::Rect& bounds,
+                                   bool maximized) {}
+  virtual bool GetSavedWindowBounds(const std::wstring& window_name,
+                                    gfx::Rect* bounds) const {
+    return false;
+  }
+  virtual bool GetSavedMaximizedState(const std::wstring& window_name,
+                                      bool* maximized) const {
+    return false;
+  }
+
+#if defined(OS_WIN)
+  virtual HICON GetDefaultWindowIcon() const { return 0; }
+#endif
+
+  virtual void AddRef() {
+  }
+
+  virtual void ReleaseRef() {
+    MessageLoopForUI::current()->Quit();
+  }
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ViewsDelegateImpl);
+};
+
 // PageNavigator implementation that records the URL.
 class TestingPageNavigator : public PageNavigator {
  public:
   virtual void OpenURL(const GURL& url, const GURL& referrer,
                        WindowOpenDisposition disposition,
                        PageTransition::Type transition) {
     url_ = url;
   }
 
   GURL url_;
@@ skipping 83 matching lines @@
 
     tmp_parent.RemoveChildView(bb_view_);
 
     ViewEventTestBase::SetUp();
   }
 
   virtual void TearDown() {
     views::MenuItemView::allow_task_nesting_during_run_ = false;
     ViewEventTestBase::TearDown();
     BookmarkBarView::testing_ = false;
+    views::ViewsDelegate::views_delegate = NULL;
   }
 
  protected:
+  void InstallViewsDelegate() {
+    views::ViewsDelegate::views_delegate = &views_delegate_;
+  }
+
   virtual views::View* CreateContentsView() {
     return bb_view_;
   }
 
   virtual gfx::Size GetPreferredSize() { return bb_view_pref_; }
 
   // See comment above class description for what this does.
   virtual bool CreateBigMenu() { return false; }
 
   BookmarkModel* model_;
@@ skipping 29 matching lines @@
     model_->AddURL(of, 1, L"ofb", GURL(test_base + "ofb"));
     const BookmarkNode* of2 = model_->AddGroup(model_->other_node(), 2, L"OF2");
     model_->AddURL(of2, 0, L"of2a", GURL(test_base + "of2a"));
     model_->AddURL(of2, 1, L"of2b", GURL(test_base + "of2b"));
   }
 
   gfx::Size bb_view_pref_;
   scoped_ptr<TestingProfile> profile_;
   ChromeThread ui_thread_;
   ChromeThread file_thread_;
+  ViewsDelegateImpl views_delegate_;
 };
 
 // Clicks on first menu, makes sure button is depressed. Moves mouse to first
 // child, clicks it and makes sure a navigation occurs.
 class BookmarkBarViewTest1 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = bb_view_->GetBookmarkButton(0);
@@ skipping 149 matching lines @@
 
     // And submenu we last clicked is showing.
     child_menu = menu->GetSubmenu()->GetMenuItemAt(2);
     ASSERT_TRUE(child_menu != NULL);
     ASSERT_TRUE(child_menu->GetSubmenu()->IsShowing());
 
     // Nothing should have been selected.
     EXPECT_EQ(GURL(), navigator_.url_);
 
     // Hide menu.
-    menu->GetMenuController()->Cancel(true);
+    menu->GetMenuController()->CancelAll();
 
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest3, Submenus)
 
 // Observer that posts task upon the context menu creation.
 // This is necessary for Linux as the context menu has to check
 // the clipboard, which invokes the event loop.
@@ skipping 394 matching lines @@
     MessageLoop::current()->PostDelayedTask(FROM_HERE,
         NewRunnableMethod(this, &BookmarkBarViewTest9::Step4), 200);
   }
 
   void Step4() {
     gfx::Point menu_loc;
     views::View::ConvertPointToScreen(first_menu_, &menu_loc);
     ASSERT_NE(start_y_, menu_loc.y());
 
     // Hide menu.
-    bb_view_->GetMenu()->GetMenuController()->Cancel(true);
+    bb_view_->GetMenu()->GetMenuController()->CancelAll();
 
     // On linux, Cancelling menu will call Quit on the message loop,
     // which can interfere with Done. We need to run Done in the
     // next execution loop.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         NewRunnableMethod(this, &ViewEventTestBase::Done));
   }
 
   int start_y_;
@@ skipping 450 matching lines @@
     ASSERT_TRUE(context_menu == NULL);
 
     // But the menu should be showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     // And the deleted_menu_id_ should have been removed.
     ASSERT_TRUE(menu->GetMenuItemByID(deleted_menu_id_) == NULL);
 
-    bb_view_->GetMenu()->GetMenuController()->Cancel(true);
+    bb_view_->GetMenu()->GetMenuController()->CancelAll();
 
     Done();
   }
 
   int deleted_menu_id_;
   ContextMenuNotificationObserver observer_;
 };
 
 VIEW_TEST(BookmarkBarViewTest15, MenuStaysVisibleAfterDelete)
+
+// Tests that we don't crash or get stuck if the parent of a menu is closed.
+class BookmarkBarViewTest16 : public BookmarkBarViewEventTestBase {
+ protected:
+  virtual void DoTestOnMessageLoop() {
+    InstallViewsDelegate();
+
+    // Move the mouse to the first folder on the bookmark bar and press the
+    // mouse.
+    views::TextButton* button = bb_view_->GetBookmarkButton(0);
+    ui_controls::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+        ui_controls::DOWN | ui_controls::UP,
+        CreateEventTask(this, &BookmarkBarViewTest16::Step2));
+  }
+
+ private:
+  void Step2() {
+    // Menu should be showing.
+    views::MenuItemView* menu = bb_view_->GetMenu();
+    ASSERT_TRUE(menu != NULL);
+    ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
+
+    // Button should be depressed.
+    views::TextButton* button = bb_view_->GetBookmarkButton(0);
+    ASSERT_TRUE(button->state() == views::CustomButton::BS_PUSHED);
+
+    // Close the window.
+    window_->Close();
+    window_ = NULL;
+  }
+};
+
+VIEW_TEST(BookmarkBarViewTest16, DeleteMenu)