Implement MD specs for non-tabbed windows in Ash

chrome/browser/ui/browser_browsertest.cc

 // Copyright 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 <stddef.h>
 #include <stdint.h>
 
 #include <string>
 
 #include "base/bind.h"
@@ skipping 3195 matching lines @@
   content::TestNavigationObserver observer(app_contents, 1);
   ui_test_utils::NavigateToURL(app_browser, GURL(url::kAboutBlankURL));
   observer.Wait();
 
   CheckDisplayModeMQ(ASCIIToUTF16("fullscreen"), app_contents);
 }
 
 // Test to ensure the bounds of popup, devtool, and app windows are properly
 // restored.
 IN_PROC_BROWSER_TEST_F(BrowserTest, TestPopupBounds) {
+  // TODO(tdanderson|pkasting): Change this to verify that the contents bounds
+  // set by params.initial_bounds are the same as the contents bounds in the
+  // initialized window. See crbug.com/585856.
   {
-    // Minimum size that a popup window should have appended to its height when
-    // drawn (popup window bounds are for the content, not the window). This is
-    // the size of the toolbar on views platforms.
-    const int minimum_popup_padding = 29;
+    // Minimum height a popup window should have added to the supplied content
+    // bounds when drawn. This accommodates the browser toolbar.
+    const int minimum_popup_padding = 27;
 
     // Creates an untrusted popup window and asserts that the eventual height is
     // padded with the toolbar and title bar height (initial height is content
     // height).
     Browser::CreateParams params(Browser::TYPE_POPUP, browser()->profile());
     params.initial_bounds = gfx::Rect(0, 0, 100, 122);
     Browser* browser = new Browser(params);
     gfx::Rect bounds = browser->window()->GetBounds();
 
     // Should be EXPECT_EQ, but this width is inconsistent across platforms.
@@ skipping 60 matching lines @@
     Browser* browser = new Browser(params);
     gfx::Rect bounds = browser->window()->GetBounds();
 
     // Should be EXPECT_EQ, but this width is inconsistent across platforms.
     // See https://crbug.com/567925.
     EXPECT_GE(bounds.width(), 100);
     EXPECT_EQ(122, bounds.height());
     browser->window()->Close();
   }
 }