Work in progress: Adds MessagePumpDispatcher::ShouldExit(). This is used to handle the

chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.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 "base/bind.h"
 #include "base/callback.h"
 #include "base/compiler_specific.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/bookmarks/bookmark_model.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h"
 #include "chrome/common/chrome_notification_types.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "chrome/test/base/view_event_test_base.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/page_navigator.h"
 #include "content/test/test_browser_thread.h"
@@ skipping 156 matching lines @@
     profile_->CreateBookmarkModel(true);
     profile_->BlockUntilBookmarkModelLoaded();
     profile_->GetPrefs()->SetBoolean(prefs::kShowBookmarkBar, true);
 
     browser_.reset(new Browser(Browser::TYPE_TABBED, profile_.get()));
 
     model_ = profile_->GetBookmarkModel();
     model_->ClearStore();
 
     bb_view_.reset(new BookmarkBarView(browser_.get()));
+    bb_view_->set_parent_owned(false);
     bb_view_->SetPageNavigator(&navigator_);
 
     AddTestData(CreateBigMenu());
 
     // Calculate the preferred size so that one button doesn't fit, which
     // triggers the overflow button to appear.
     //
     // BookmarkBarView::Layout does nothing if the parent is NULL and
     // GetPreferredSize hard codes a width of 1. For that reason we add the
     // BookmarkBarView to a dumby view as the parent.
@@ skipping 13 matching lines @@
       bb_view_->SetBounds(0, 0, bb_view_pref_.width(), bb_view_pref_.height());
       bb_view_->Layout();
     }
 
     tmp_parent.RemoveChildView(bb_view_.get());
 
     ViewEventTestBase::SetUp();
   }
 
   virtual void TearDown() {
-    // Destroy everything, then run the message loop to ensure we delete all
-    // Tasks and fully shut down.
-    browser_->CloseAllTabs();
-    bb_view_.reset();
-    browser_.reset();
+    DestroyBrowser();
     profile_.reset();
+
+    // Run the message loop to ensure we delete allTasks and fully shut down.
     MessageLoop::current()->PostTask(FROM_HERE, MessageLoop::QuitClosure());
     MessageLoop::current()->Run();
 
     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_.get();
   }
 
   virtual gfx::Size GetPreferredSize() { return bb_view_pref_; }
 
   views::TextButton* GetBookmarkButton(int view_index) {
     return bb_view_->GetBookmarkButton(view_index);
   }
 
+  void DestroyBrowser() {
+    if (!browser_.get())
+      return;
+
+    browser_->CloseAllTabs();
+    bb_view_.reset();
+    browser_.reset();
+  }
+
   // See comment above class description for what this does.
   virtual bool CreateBigMenu() { return false; }
 
+  Browser* browser() { return browser_.get(); }
+
   BookmarkModel* model_;
   scoped_ptr<BookmarkBarView> bb_view_;
   TestingPageNavigator navigator_;
 
  private:
   void AddTestData(bool big_menu) {
     const BookmarkNode* bb_node = model_->bookmark_bar_node();
     std::string test_base = "file:///c:/tmp/";
     const BookmarkNode* f1 = model_->AddFolder(bb_node, 0, ASCIIToUTF16("F1"));
     model_->AddURL(f1, 0, ASCIIToUTF16("f1a"), GURL(test_base + "f1a"));
@@ skipping 1317 matching lines @@
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     menu->GetMenuController()->CancelAll();
 
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)
+
+// Verifies mousing over an already open sibling menu doesn't prematurely cancel
+// the menu.
+class BookmarkBarViewTest20 : public BookmarkBarViewEventTestBase {
+ public:
+  BookmarkBarViewTest20() {}
+
+ protected:
+  virtual void DoTestOnMessageLoop() OVERRIDE {
+    // Press the mouse button on the overflow button. Don't release it though.
+    /*
+    views::TextButton* button = bb_view_->overflow_button();
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+        ui_controls::DOWN, CreateEventTask(this,
+                                           &BookmarkBarViewTest20::Step2));
+    */
+    views::TextButton* button = bb_view_->other_bookmarked_button();
+    ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
+        ui_controls::DOWN | ui_controls::UP,
+        CreateEventTask(this, &BookmarkBarViewTest20::Step2));
+  }
+
+ private:
+  void Step2() {
+    printf("menu showing\n");
+    // Menu should be showing.
+    views::MenuItemView* menu = bb_view_->GetMenu();
+    ASSERT_TRUE(menu != NULL);
+    ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
+
+    // Destroy the window.
+    window_->Close();
+    window_ = NULL;
+
+    MessageLoop::current()->PostTask(
+        FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest12::Done));
+  }
+
+  DISALLOW_COPY_AND_ASSIGN(BookmarkBarViewTest20);
+};
+
+VIEW_TEST(BookmarkBarViewTest20, DestroyBrowserWhileMenuRunning)