Parametrize a variety of constants in preparation for changing them in MD.

chrome/browser/ui/views/frame/browser_view_unittest.cc

Index: chrome/browser/ui/views/frame/browser_view_unittest.cc
diff --git a/chrome/browser/ui/views/frame/browser_view_unittest.cc b/chrome/browser/ui/views/frame/browser_view_unittest.cc
index d544ea0cfb08339262d66105b9b59ae18d451bea..a693b05ce586c64528c709b745d4d9a05c1ffea2 100644
--- a/chrome/browser/ui/views/frame/browser_view_unittest.cc
+++ b/chrome/browser/ui/views/frame/browser_view_unittest.cc
@@ -11,6 +11,7 @@
 #include "chrome/browser/ui/views/frame/test_with_browser_view.h"
 #include "chrome/browser/ui/views/frame/top_container_view.h"
 #include "chrome/browser/ui/views/infobars/infobar_container_view.h"
+#include "chrome/browser/ui/views/layout_constants.h"
 #include "chrome/browser/ui/views/tabs/tab_strip.h"
 #include "chrome/browser/ui/views/toolbar/toolbar_view.h"
 #include "chrome/common/url_constants.h"
@@ -93,10 +94,8 @@ TEST_F(BrowserViewTest, BrowserViewLayout) {
   EXPECT_EQ(expected_tabstrip_origin.x(), tabstrip->x());
   EXPECT_EQ(expected_tabstrip_origin.y(), tabstrip->y());
   EXPECT_EQ(0, toolbar->x());
-  EXPECT_EQ(
-      tabstrip->bounds().bottom() -
-          BrowserViewLayout::kToolbarTabStripVerticalOverlap,
-      toolbar->y());
+  const int overlap = GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP);
+  EXPECT_EQ(tabstrip->bounds().bottom() - overlap, toolbar->y());
   EXPECT_EQ(0, contents_container->x());
   EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());
   EXPECT_EQ(top_container->bounds().bottom(), contents_container->y());
@@ -133,9 +132,7 @@ TEST_F(BrowserViewTest, BrowserViewLayout) {
   // Bookmark bar layout on NTP.
   EXPECT_EQ(0, bookmark_bar->x());
   EXPECT_EQ(
-      tabstrip->bounds().bottom() +
-          toolbar->height() -
-          BrowserViewLayout::kToolbarTabStripVerticalOverlap -
+      tabstrip->bounds().bottom() + toolbar->height() - overlap -
           views::NonClientFrameView::kClientEdgeThickness,
       bookmark_bar->y());
   EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());