Ensure default dialog button focus remains after a dialog update.

ui/views/window/dialog_client_view_unittest.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 "ui/views/window/dialog_client_view.h"
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "build/build_config.h"
 #include "ui/base/test/material_design_controller_test_api.h"
@@ skipping 387 matching lines @@
   // Remove |extra_button| from the View hierarchy so that it can be replaced.
   delete extra_button;
 
   // Non-buttons should always be sized to their preferred size.
   View* boring_view = new StaticSizedView(gfx::Size(20, 20));
   SetExtraView(boring_view);
   CheckContentsIsSetToPreferredSize();
   EXPECT_EQ(20, boring_view->width());
 }
 
+// Tests that the default focus of the button reamins after a dialog update.

[sky, 2017/04/28 20:49:52]

Just to be clear, does these tests fail without your patch?

[ackermanb, 2017/05/17 17:20:54]

Yep, the tests do fail out without the patch.

+TEST_F(DialogClientViewTest, DefaultFocus) {
+  // Test with just an ok button.
+  SetDialogButtons(ui::DIALOG_BUTTON_OK);
+  EXPECT_EQ(client_view()->ok_button(), GetInitiallyFocusedView());
+  GetInitiallyFocusedView()->RequestFocus();  // Focus is not given by default.
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+  client_view()->UpdateDialogButtons();
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+
+  // Test with just a cancel button.
+  SetDialogButtons(ui::DIALOG_BUTTON_CANCEL);
+  EXPECT_EQ(client_view()->cancel_button(), GetInitiallyFocusedView());
+  GetInitiallyFocusedView()->RequestFocus();  // Focus is not given by default.
+  EXPECT_TRUE(client_view()->cancel_button()->HasFocus());
+  client_view()->UpdateDialogButtons();
+  EXPECT_TRUE(client_view()->cancel_button()->HasFocus());
+
+  // Test with both buttons, the ok button is default.
+  SetDialogButtons(ui::DIALOG_BUTTON_CANCEL | ui::DIALOG_BUTTON_OK);
+  EXPECT_EQ(client_view()->ok_button(), GetInitiallyFocusedView());
+  GetInitiallyFocusedView()->RequestFocus();  // Focus is not given by default.
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+  EXPECT_FALSE(client_view()->cancel_button()->HasFocus());
+  client_view()->UpdateDialogButtons();
+  EXPECT_TRUE(client_view()->ok_button()->HasFocus());
+  EXPECT_FALSE(client_view()->cancel_button()->HasFocus());
+}
+
 }  // namespace views