Update MenuControllerTest Widget Creation

ui/views/controls/menu/menu_controller_unittest.cc

 // Copyright 2014 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 "ui/views/controls/menu/menu_controller.h"
 
 #include "base/callback.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 1484 matching lines @@
   MenuItemView* run_result =
       controller->Run(nullptr, nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
 }
 
 // Tests that if a MenuController is destroying during drag/drop, and another
 // MenuController becomes active, that the exiting of drag does not cause a
 // crash.
 TEST_F(MenuControllerTest, MenuControllerReplacedDuringDrag) {
-  // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
-  if (IsMus())
-    return;
-
+  // Build the menu so that the appropriate root window is available to set the
+  // drag drop client on.
+  AddButtonMenuItems();
   TestDragDropClient drag_drop_client(
       base::Bind(&MenuControllerTest::TestMenuControllerReplacementDuringDrag,
                  base::Unretained(this)));
-  aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(),
+  aura::client::SetDragDropClient(menu_item()
+                                      ->GetSubmenu()
+                                      ->GetWidget()
+                                      ->GetNativeWindow()
+                                      ->GetRootWindow(),
                                   &drag_drop_client);
-  AddButtonMenuItems();
   StartDrag();
 }
 
 // Tests that if a CancelAll is called during drag-and-drop that it does not
 // destroy the MenuController. On Windows and Linux this destruction also
 // destroys the Widget used for drag-and-drop, thereby ending the drag.
 TEST_F(MenuControllerTest, CancelAllDuringDrag) {
-  // TODO: this test wedges with aura-mus-client. http://crbug.com/664280.
-  if (IsMus())
-    return;
-
   MenuController* controller = menu_controller();
   controller->SetAsyncRun(true);
 
+  // Build the menu so that the appropriate root window is available to set the
+  // drag drop client on.
+  AddButtonMenuItems();
   TestDragDropClient drag_drop_client(base::Bind(
       &MenuControllerTest::TestCancelAllDuringDrag, base::Unretained(this)));
-  aura::client::SetDragDropClient(owner()->GetNativeWindow()->GetRootWindow(),
+  aura::client::SetDragDropClient(menu_item()
+                                      ->GetSubmenu()
+                                      ->GetWidget()
+                                      ->GetNativeWindow()
+                                      ->GetRootWindow(),
                                   &drag_drop_client);
-  AddButtonMenuItems();
   StartDrag();
 }
 
 // Tests that when releasing the ref on ViewsDelegate and MenuController is
 // deleted, that shutdown occurs without crashing.
 TEST_F(MenuControllerTest, DestroyedDuringViewsRelease) {
   ExitMenuRun();
   MenuController* controller = menu_controller();
   controller->SetAsyncRun(true);
 
   int mouse_event_flags = 0;
   MenuItemView* run_result =
       controller->Run(owner(), nullptr, menu_item(), gfx::Rect(),
                       MENU_ANCHOR_TOPLEFT, false, false, &mouse_event_flags);
   EXPECT_EQ(run_result, nullptr);
   TestDestroyedDuringViewsRelease();
 }
 
 #endif  // defined(USE_AURA)
 
 }  // namespace test
 }  // namespace views