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

chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.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 "chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h"
 
 #include <algorithm>
 
 #include "ash/common/ash_layout_constants.h"
 #include "ash/common/frame/caption_buttons/frame_caption_button_container_view.h"
@@ skipping 486 matching lines @@
   if (toolbar_bounds.IsEmpty())
     return;
   gfx::Point toolbar_origin(toolbar_bounds.origin());
   View::ConvertPointToTarget(browser_view(), this, &toolbar_origin);
   toolbar_bounds.set_origin(toolbar_origin);
 
   const ui::ThemeProvider* tp = GetThemeProvider();
   const gfx::ImageSkia* const bg = tp->GetImageSkiaNamed(IDR_THEME_TOOLBAR);
   const int x = toolbar_bounds.x();
   const int y = toolbar_bounds.y();
-  const int bg_y = GetTopInset(false) + Tab::GetYInsetForActiveTabBackground();
+  const int bg_y = GetTopInset(false) + GetLayoutInsets(TAB).top();
   const int w = toolbar_bounds.width();
   const int h = toolbar_bounds.height();
   const SkColor separator_color =
       tp->GetColor(ThemeProperties::COLOR_TOOLBAR_BOTTOM_SEPARATOR);
   if (ui::MaterialDesignController::IsModeMaterial()) {
     // Background.  The top stroke is drawn above the toolbar bounds, so
     // unlike in the non-Material Design code below, we don't need to exclude
     // any region from having the background image drawn over it.
     if (tp->HasCustomImage(IDR_THEME_TOOLBAR)) {
       canvas->TileImageInt(*bg, x + GetThemeBackgroundXInset(), y - bg_y, x, y,
@@ skipping 45 matching lines @@
     // TODO(pkasting): The "2 *" part of this makes no sense to me.
     canvas->TileImageInt(*right, 0, 0, w - (2 * kClientEdgeThickness) - img_w,
                          img_y, img_w, img_h);
 
     // Toolbar/content separator.
     toolbar_bounds.Inset(kClientEdgeThickness, h - kClientEdgeThickness,
                          kClientEdgeThickness, 0);
     canvas->FillRect(toolbar_bounds, separator_color);
   }
 }