Fixes drag and drop crash. The problem was when I made

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"
@@ skipping 24 matching lines @@
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/views_delegate.h"
 #include "ui/views/widget/widget.h"
 
 using content::BrowserThread;
 using content::OpenURLParams;
 using content::PageNavigator;
 using content::WebContents;
 
-#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
-
-// Two bugs here. http://crbug.com/47089 for general Linux Views, and
-// http://crbug.com/47452 for ChromiumOS.
-#define MAYBE_CloseWithModalDialog DISABLED_CloseWithModalDialog
-// See http://crbug.com/47089 for details.
-#define MAYBE_CloseMenuAfterClosingContextMenu \
-        DISABLED_CloseMenuAfterClosingContextMenu
-
-// See bug http://crbug.com/60444 for details.
-#define MAYBE_ScrollButtonScrolls DISABLED_ScrollButtonScrolls
-#else
-
-#define MAYBE_DND DND
-#define MAYBE_DNDToDifferentMenu DNDToDifferentMenu
-#define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
-#define MAYBE_DNDBackToOriginatingMenu DNDBackToOriginatingMenu
-#define MAYBE_KeyEvents KeyEvents
-#define MAYBE_CloseWithModalDialog CloseWithModalDialog
-#define MAYBE_CloseMenuAfterClosingContextMenu CloseMenuAfterClosingContextMenu
-#define MAYBE_ScrollButtonScrolls ScrollButtonScrolls
-
-#endif
-
 namespace {
 
 void MoveMouseAndPress(const gfx::Point& screen_pos,
                        ui_controls::MouseButton button,
                        int state,
                        const base::Closure& closure) {
   ui_controls::SendMouseMove(screen_pos.x(), screen_pos.y());
   ui_controls::SendMouseEventsNotifyWhenDone(button, state, closure);
 }
 
@@ skipping 559 matching lines @@
 
   void Step5() {
     GURL url = model_->bookmark_bar_node()->GetChild(0)->GetChild(1)->url();
     EXPECT_EQ(url_dragging_, url);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest5, MAYBE_DND)
+VIEW_TEST(BookmarkBarViewTest5, DND)
 
 // Tests holding mouse down on overflow button, dragging such that menu pops up
 // then selecting an item.
 class BookmarkBarViewTest6 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // 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, &BookmarkBarViewTest6::Step2));
@@ skipping 58 matching lines @@
         CreateEventTask(this, &BookmarkBarViewTest7::Step3));
   }
 
   void Step3() {
     // Drag over other button.
     views::TextButton* other_button =
         bb_view_->other_bookmarked_button();
     gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     views::View::ConvertPointToScreen(other_button, &loc);
 
+#if defined(USE_AURA)
+    // TODO: fix this. Aura requires an additional mouse event to trigger drag
+    // and drop checking state.
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
+        base::Bind(&BookmarkBarViewTest7::Step3A, this));
+#else
     // Start a drag.
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         base::Bind(&BookmarkBarViewTest7::Step4, this));
 
     // See comment above this method as to why we do this.
     ScheduleMouseMoveInBackground(loc.x(), loc.y());
+#endif
+  }
+
+  void Step3A() {
+    // Drag over other button.
+    views::TextButton* other_button =
+        bb_view_->other_bookmarked_button();
+    gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
+    views::View::ConvertPointToScreen(other_button, &loc);
+
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x(), loc.y(),
+        base::Bind(&BookmarkBarViewTest7::Step4, this));
   }
 
   void Step4() {
     views::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     views::MenuItemView* target_menu =
         drop_menu->GetSubmenu()->GetMenuItemAt(0);
     gfx::Point loc(1, 1);
     views::View::ConvertPointToScreen(target_menu, &loc);
     ui_controls::SendMouseMove(loc.x(), loc.y());
     ui_controls::SendMouseEventsNotifyWhenDone(
         ui_controls::LEFT, ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest7::Step5));
   }
 
   void Step5() {
     ASSERT_TRUE(model_->other_node()->GetChild(0)->url() == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest7, MAYBE_DNDToDifferentMenu)
+VIEW_TEST(BookmarkBarViewTest7, DNDToDifferentMenu)
 
 // Drags from one menu to next so that original menu closes, then back to
 // original menu.
 class BookmarkBarViewTest8 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     url_dragging_ =
         model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url();
 
     // Move the mouse to the first folder on the bookmark bar and press the
@@ skipping 22 matching lines @@
   }
 
   void Step3() {
     // Drag over other button.
     views::TextButton* other_button =
         bb_view_->other_bookmarked_button();
     gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
     views::View::ConvertPointToScreen(other_button, &loc);
 
     // Start a drag.
+#if defined(USE_AURA)
+    // TODO: fix this. Aura requires an additional mouse event to trigger drag
+    // and drop checking state.
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
+        base::Bind(&BookmarkBarViewTest8::Step3A, this));
+#else
     ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
         base::Bind(&BookmarkBarViewTest8::Step4, this));
-
     // See comment above this method as to why we do this.
     ScheduleMouseMoveInBackground(loc.x(), loc.y());
+#endif
+  }
+
+  void Step3A() {
+    // Drag over other button.
+    views::TextButton* other_button =
+        bb_view_->other_bookmarked_button();
+    gfx::Point loc(other_button->width() / 2, other_button->height() / 2);
+    views::View::ConvertPointToScreen(other_button, &loc);
+
+    ui_controls::SendMouseMoveNotifyWhenDone(loc.x() + 10, loc.y(),
+        base::Bind(&BookmarkBarViewTest8::Step4, this));
   }
 
   void Step4() {
     views::MenuItemView* drop_menu = bb_view_->GetDropMenu();
     ASSERT_TRUE(drop_menu != NULL);
     ASSERT_TRUE(drop_menu->GetSubmenu()->IsShowing());
 
     // Now drag back over first menu.
     views::TextButton* button = GetBookmarkButton(0);
     gfx::Point loc(button->width() / 2, button->height() / 2);
@@ skipping 19 matching lines @@
     // Make sure drop was processed.
     GURL final_url = model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->
         GetChild(1)->url();
     ASSERT_TRUE(final_url == url_dragging_);
     Done();
   }
 
   GURL url_dragging_;
 };
 
-VIEW_TEST(BookmarkBarViewTest8, MAYBE_DNDBackToOriginatingMenu)
+VIEW_TEST(BookmarkBarViewTest8, DNDBackToOriginatingMenu)
 
 // Moves the mouse over the scroll button and makes sure we get scrolling.
 class BookmarkBarViewTest9 : public BookmarkBarViewEventTestBase {
  protected:
   virtual bool CreateBigMenu() { return true; }
 
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
@@ skipping 50 matching lines @@
     // next execution loop.
     MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&ViewEventTestBase::Done, this));
   }
 
   int start_y_;
   views::MenuItemView* first_menu_;
 };
 
-VIEW_TEST(BookmarkBarViewTest9, MAYBE_ScrollButtonScrolls)
+VIEW_TEST(BookmarkBarViewTest9, ScrollButtonScrolls)
 
 // Tests up/down/left/enter key messages.
 class BookmarkBarViewTest10 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Move the mouse to the first folder on the bookmark bar and press the
     // mouse.
     views::TextButton* button = GetBookmarkButton(0);
     ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
@@ skipping 85 matching lines @@
   }
 
   void Step8() {
     ASSERT_TRUE(
         model_->bookmark_bar_node()->GetChild(0)->GetChild(0)->url() ==
         navigator_.url_);
     Done();
   }
 };
 
-VIEW_TEST(BookmarkBarViewTest10, MAYBE_KeyEvents)
+VIEW_TEST(BookmarkBarViewTest10, KeyEvents)
 
 // Make sure the menu closes with the following sequence: show menu, show
 // context menu, close context menu (via escape), then click else where. This
 // effectively verifies we maintain mouse capture after the context menu is
 // hidden.
 class BookmarkBarViewTest11 : public BookmarkBarViewEventTestBase {
  public:
   BookmarkBarViewTest11()
       : ALLOW_THIS_IN_INITIALIZER_LIST(
           observer_(CreateEventTask(this, &BookmarkBarViewTest11::Step3))) {
@@ skipping 56 matching lines @@
     // Make sure the menu is not showing.
     views::MenuItemView* menu = bb_view_->GetMenu();
     ASSERT_TRUE(!menu || !menu->GetSubmenu() ||
                 !menu->GetSubmenu()->IsShowing());
     Done();
   }
 
   ContextMenuNotificationObserver observer_;
 };
 
-VIEW_TEST(BookmarkBarViewTest11, MAYBE_CloseMenuAfterClosingContextMenu)
+VIEW_TEST(BookmarkBarViewTest11, CloseMenuAfterClosingContextMenu)
 
 // Tests showing a modal dialog from a context menu.
 class BookmarkBarViewTest12 : public BookmarkBarViewEventTestBase {
  protected:
   virtual void DoTestOnMessageLoop() {
     // Open up the other folder.
     views::TextButton* button = bb_view_->other_bookmarked_button();
     ui_test_utils::MoveMouseToCenterAndPress(button, ui_controls::LEFT,
         ui_controls::DOWN | ui_controls::UP,
         CreateEventTask(this, &BookmarkBarViewTest12::Step2));
@@ skipping 61 matching lines @@
     // Do a delayed task to give the dialog time to exit.
     MessageLoop::current()->PostTask(
         FROM_HERE, CreateEventTask(this, &BookmarkBarViewTest12::Step7));
   }
 
   void Step7() {
     Done();
   }
 };
 
-VIEW_TEST(BookmarkBarViewTest12, MAYBE_CloseWithModalDialog)
+VIEW_TEST(BookmarkBarViewTest12, CloseWithModalDialog)
 
 // Tests clicking on the separator of a context menu (this is for coverage of
 // bug 17862).
 class BookmarkBarViewTest13 : public BookmarkBarViewEventTestBase {
  public:
   BookmarkBarViewTest13()
       : ALLOW_THIS_IN_INITIALIZER_LIST(
           observer_(CreateEventTask(this, &BookmarkBarViewTest13::Step3))) {
   }
 
@@ skipping 419 matching lines @@
     ASSERT_TRUE(menu != NULL);
     ASSERT_TRUE(menu->GetSubmenu()->IsShowing());
 
     menu->GetMenuController()->CancelAll();
 
     Done();
   }
 };
 
 VIEW_TEST(BookmarkBarViewTest19, SiblingMenu)