Adjust positioning of location bar icons.

chrome/browser/ui/views/location_bar/icon_label_bubble_view_unittest.cc

 // Copyright 2016 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/location_bar/icon_label_bubble_view.h"
 
 #include "base/strings/utf_string_conversions.h"
+#include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/image_view.h"
 #include "ui/views/test/views_test_base.h"
 
 #if defined(USE_ASH)
 #include "ui/aura/window.h"
 #endif
 
 namespace {
@@ skipping 40 matching lines @@
     return STEADY;
   }
 
  protected:
   // IconLabelBubbleView:
   SkColor GetTextColor() const override { return kTestColor; }
 
   bool ShouldShowLabel() const override {
     return !IsShrinking() ||
            (width() > (image()->GetPreferredSize().width() +
-                       2 * LocationBarView::kHorizontalPadding));
+                       2 * LocationBarView::kIconInteriorPadding +
+                       2 * GetLayoutConstant(LOCATION_BAR_ELEMENT_PADDING)));
   }
 
   double WidthMultiplier() const override {
     const double kOpenFraction =
         static_cast<double>(kOpenTimeMS) / kAnimationDurationMS;
     double fraction = value_ / (double)kNumberOfSteps;
     switch (state()) {
       case GROWING:
         return fraction / kOpenFraction;
       case STEADY:
@@ skipping 44 matching lines @@
 
  private:
   void Reset() {
     view_->SetLabelVisible(true);
     SetValue(0);
     steady_reached_ = false;
     shrinking_reached_ = false;
     minimum_size_reached_ = false;
     previous_width_ = 0;
     initial_image_x_ = GetImageBounds().x();
-    EXPECT_NE(0, initial_image_x_);
+    EXPECT_EQ(0, initial_image_x_);
   }
 
   void VerifyAnimationStep() {
     switch (state()) {
       case TestIconLabelBubbleView::State::GROWING: {
         EXPECT_GE(width(), previous_width_);
         EXPECT_EQ(initial_image_x_, GetImageBounds().x());
         EXPECT_GE(GetImageBounds().x(), 0);
         if (GetImageBounds().width() > 0)
           EXPECT_LE(GetImageBounds().right(), width());
         EXPECT_TRUE(IsLabelVisible());
         if (GetLabelBounds().width() > 0) {
           EXPECT_GT(GetLabelBounds().x(), GetImageBounds().right());
           EXPECT_LT(GetLabelBounds().right(), width());
         }
         break;
       }
       case TestIconLabelBubbleView::State::STEADY: {
         if (steady_reached_)
           EXPECT_EQ(previous_width_, width());
         EXPECT_EQ(initial_image_x_, GetImageBounds().x());
-        EXPECT_GT(GetImageBounds().x(), 0);
         EXPECT_LT(GetImageBounds().right(), width());
         EXPECT_TRUE(IsLabelVisible());
         EXPECT_GT(GetLabelBounds().x(), GetImageBounds().right());
         EXPECT_LT(GetLabelBounds().right(), width());
         steady_reached_ = true;
         break;
       }
       case TestIconLabelBubbleView::State::SHRINKING: {
         if (shrinking_reached_)
           EXPECT_LE(width(), previous_width_);
@@ skipping 75 matching lines @@
   widget.GetContentsView()->AddChildView(icon_label_bubble_view);
   aura::Window* widget_native_view = widget.GetNativeView();
   // Remove the window from its parent. This means GetWidget() in
   // IconLabelBubbleView will return non-null, but GetWidget()->GetCompositor()
   // will return null.
   ASSERT_TRUE(widget_native_view->parent());
   widget_native_view->parent()->RemoveChild(widget_native_view);
   static_cast<views::View*>(icon_label_bubble_view)->GetPreferredSize();
 }
 #endif