Center Keyboard Overlay in the work area

ash/content/keyboard_overlay/keyboard_overlay_delegate_unittest.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 "ash/content/keyboard_overlay/keyboard_overlay_delegate.h"
 
 #include "ash/common/shelf/wm_shelf.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 22 matching lines @@
 // Verifies we can show and close the widget for the overlay dialog.
 TEST_P(KeyboardOverlayDelegateTest, ShowAndClose) {
   if (!SupportsMultipleDisplays())
     return;
 
   UpdateDisplay("500x400,300x200");
   GetPrimaryShelf()->SetAlignment(shelf_alignment());
   KeyboardOverlayDelegate delegate(base::ASCIIToUTF16("Title"),
                                    GURL("chrome://keyboardoverlay/"));
   // Showing the dialog creates a widget.
-  views::Widget* widget = delegate.Show(NULL);
+  views::Widget* widget = delegate.Show(nullptr);
   EXPECT_TRUE(widget);
 
   // The widget is on the primary root window.
   EXPECT_EQ(Shell::GetPrimaryRootWindow(),
             widget->GetNativeWindow()->GetRootWindow());
 
-  // The widget is horizontally centered at the bottom of the work area.
+  // The widget is horizontally and vertically centered in the work area.
   gfx::Rect work_area =
       display::Screen::GetScreen()->GetPrimaryDisplay().work_area();
   gfx::Rect bounds = widget->GetRestoredBounds();
   EXPECT_EQ(work_area.CenterPoint().x(), bounds.CenterPoint().x());
-  EXPECT_EQ(work_area.bottom(), bounds.bottom());
+  EXPECT_EQ(work_area.y() + (work_area.height() - bounds.height()) / 2,
+            bounds.y());
 
   // Clean up.
   widget->CloseNow();
 }
 
-// Tests run three times - for all possible values of shelf alignment
+// Tests run four times - for all possible values of shelf alignment
 INSTANTIATE_TEST_CASE_P(ShelfAlignmentAny,
                         KeyboardOverlayDelegateTest,
                         testing::Values(SHELF_ALIGNMENT_BOTTOM,
                                         SHELF_ALIGNMENT_LEFT,
                                         SHELF_ALIGNMENT_RIGHT,
                                         SHELF_ALIGNMENT_BOTTOM_LOCKED));
 
 }  // namespace ash