Revert of desktop_aura: do not restore focused view if it has modal transient child

ui/views/widget/widget_interactive_uitest.cc

 // Copyright (c) 2013 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 <stddef.h>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/macros.h"
@@ skipping 1253 matching lines @@
   EXPECT_TRUE(minimize_waiter.Wait());
 
   PropertyWaiter restore_waiter(
       base::Bind(&Widget::IsMinimized, base::Unretained(widget)), false);
   widget->Restore();
   EXPECT_TRUE(restore_waiter.Wait());
 
   widget->CloseNow();
 }
 
-#if defined(USE_AURA) && !defined(OS_CHROMEOS)
-// Tests that when a desktop native widget has modal transient child, it should
-// avoid restore focused view itself as the modal transient child window will do
-// that, thus avoids having multiple focused view visually (crbug.com/727641).
-TEST_F(WidgetTestInteractive, DesktopNativeWidgetWithModalTransientChild) {
-  // Create a top level desktop native widget.
-  Widget* top_level = CreateWidget();
-
-  Textfield* textfield = new Textfield;
-  textfield->SetBounds(0, 0, 200, 20);
-  top_level->GetRootView()->AddChildView(textfield);
-  ShowSync(top_level);
-  textfield->RequestFocus();
-  EXPECT_TRUE(textfield->HasFocus());
-
-  // Create a modal dialog.
-  // This instance will be destroyed when the dialog is destroyed.
-  ModalDialogDelegate* dialog_delegate =
-      new ModalDialogDelegate(ui::MODAL_TYPE_WINDOW);
-  Widget* modal_dialog_widget = DialogDelegate::CreateDialogWidget(
-      dialog_delegate, nullptr, top_level->GetNativeView());
-  modal_dialog_widget->SetBounds(gfx::Rect(0, 0, 100, 10));
-  Textfield* dialog_textfield = new Textfield;
-  dialog_textfield->SetBounds(0, 0, 50, 5);
-  modal_dialog_widget->GetRootView()->AddChildView(dialog_textfield);
-  // Dialog widget doesn't need a ShowSync as it gains active status
-  // synchronously.
-  modal_dialog_widget->Show();
-  dialog_textfield->RequestFocus();
-  EXPECT_TRUE(dialog_textfield->HasFocus());
-  EXPECT_FALSE(textfield->HasFocus());
-
-  DeactivateSync(top_level);
-  EXPECT_FALSE(dialog_textfield->HasFocus());
-  EXPECT_FALSE(textfield->HasFocus());
-
-  // After deactivation and activation of top level widget, only modal dialog
-  // should restore focused view.
-  ActivateSync(top_level);
-  EXPECT_TRUE(dialog_textfield->HasFocus());
-  EXPECT_FALSE(textfield->HasFocus());
-
-  top_level->CloseNow();
-}
-#endif  // defined(USE_AURA) && !defined(OS_CHROMEOS)
-
 namespace {
 
 // Helper class for CaptureLostTrackingWidget to store whether
 // OnMouseCaptureLost has been invoked for a widget.
 class CaptureLostState {
  public:
   CaptureLostState() : got_capture_lost_(false) {}
 
   bool GetAndClearGotCaptureLost() {
     bool value = got_capture_lost_;
@@ skipping 579 matching lines @@
 
   ui::KeyEvent key_event2(key_event);
   widget->OnKeyEvent(&key_event2);
   EXPECT_FALSE(key_event2.stopped_propagation());
 
   widget->CloseNow();
 }
 
 }  // namespace test
 }  // namespace views