Remove some pre-MD code from toolbar/tabstrip/frame.

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

 // Copyright 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 "chrome/browser/ui/views/frame/browser_view.h"
 
 #include "base/macros.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/layout_constants.h"
@@ skipping 78 matching lines @@
 
   // Verify basic layout.
   EXPECT_EQ(0, top_container->x());
   EXPECT_EQ(0, top_container->y());
   EXPECT_EQ(browser_view()->width(), top_container->width());
   // Tabstrip layout varies based on window frame sizes.
   gfx::Point expected_tabstrip_origin = ExpectedTabStripOrigin(browser_view());
   EXPECT_EQ(expected_tabstrip_origin.x(), tabstrip->x());
   EXPECT_EQ(expected_tabstrip_origin.y(), tabstrip->y());
   EXPECT_EQ(0, toolbar->x());
-  const int overlap = GetLayoutConstant(TABSTRIP_TOOLBAR_OVERLAP);
-  EXPECT_EQ(tabstrip->bounds().bottom() - overlap, toolbar->y());
+  EXPECT_EQ(tabstrip->bounds().bottom(), 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());
   EXPECT_EQ(0, devtools_web_view->x());
   EXPECT_EQ(0, devtools_web_view->y());
   EXPECT_EQ(0, contents_web_view->x());
   EXPECT_EQ(0, contents_web_view->y());
 
   // Verify bookmark bar visibility.
   BookmarkBarView* bookmark_bar = browser_view()->GetBookmarkBarView();
@@ skipping 18 matching lines @@
   // infobar container and then top container.
   EXPECT_EQ(browser_view()->child_count() - 1,
             browser_view()->GetIndexOf(browser_view()->find_bar_host_view()));
   EXPECT_EQ(browser_view()->child_count() - 2,
             browser_view()->GetIndexOf(browser_view()->infobar_container()));
   EXPECT_EQ(browser_view()->child_count() - 3,
             browser_view()->GetIndexOf(top_container));
 
   // Bookmark bar layout on NTP.
   EXPECT_EQ(0, bookmark_bar->x());
-  EXPECT_EQ(
-      tabstrip->bounds().bottom() + toolbar->height() - overlap -
-          views::NonClientFrameView::kClientEdgeThickness,
-      bookmark_bar->y());
+  EXPECT_EQ(tabstrip->bounds().bottom() + toolbar->height() -
+                views::NonClientFrameView::kClientEdgeThickness,
+            bookmark_bar->y());
   EXPECT_EQ(toolbar->bounds().bottom(), contents_container->y());
   // Contents view has a "top margin" pushing it below the bookmark bar.
   EXPECT_EQ(bookmark_bar->height() -
                 views::NonClientFrameView::kClientEdgeThickness,
             devtools_web_view->y());
   EXPECT_EQ(bookmark_bar->height() -
                 views::NonClientFrameView::kClientEdgeThickness,
             contents_web_view->y());
 
   // Bookmark bar is parented back to top container on normal page.
@@ skipping 65 matching lines @@
       header_offset.y();
 
   // The web contents should be flush with the bottom of the header.
   EXPECT_EQ(bottom_of_header, contents_container->y());
 
   // The find bar should overlap the 1px header/web-contents separator at the
   // bottom of the header.
   EXPECT_LT(browser_view()->GetFindBarBoundingBox().y(),
             browser_view()->frame()->GetTopInset(false));
 }