Eliminate custom animation disable hook for IconLabelBubbleView separator.

This not only simplifies the code, it allows moving the SeparatorView class to
be a private member, which will allow it to access a private data member of
IconLabelBubbleView in a future CL.

Bug: 1033922
Change-Id: Ic1fe818e997b36dd3c96c082c8de0de4faaf2e25
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1983454
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Evan Stade <estade@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727828}

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

@@ -107,15 +107,10 @@ void IconLabelBubbleView::SeparatorView::UpdateOpacity() {
     duration = kIconLabelBubbleFadeInDurationMs;
   }
 
-  if (disable_animation_for_test_) {
-    layer()->SetOpacity(opacity);
-  } else {
-    ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());
-    animation.SetTransitionDuration(
-        base::TimeDelta::FromMilliseconds(duration));
-    animation.SetTweenType(gfx::Tween::Type::EASE_IN);
-    layer()->SetOpacity(opacity);
-  }
+  ui::ScopedLayerAnimationSettings animation(layer()->GetAnimator());
+  animation.SetTransitionDuration(base::TimeDelta::FromMilliseconds(duration));
+  animation.SetTweenType(gfx::Tween::Type::EASE_IN);
+  layer()->SetOpacity(opacity);
 }
 
 //////////////////////////////////////////////////////////////////

chrome/browser/ui/views/location_bar/icon_label_bubble_view.h

@@ -58,30 +58,6 @@ class IconLabelBubbleView : public views::InkDropObserver,
     virtual SkColor GetIconLabelBubbleInkDropColor() const;
   };
 
-  // A view that draws the separator.
-  class SeparatorView : public views::View {
-   public:
-    explicit SeparatorView(IconLabelBubbleView* owner);
-
-    // views::View:
-    void OnPaint(gfx::Canvas* canvas) override;
-
-    // Updates the opacity based on the ink drop's state.
-    void UpdateOpacity();
-
-    void set_disable_animation_for_test(bool disable_animation_for_test) {
-      disable_animation_for_test_ = disable_animation_for_test;
-    }
-
-   private:
-    // Weak.
-    IconLabelBubbleView* owner_;
-
-    bool disable_animation_for_test_ = false;
-
-    DISALLOW_COPY_AND_ASSIGN(SeparatorView);
-  };
-
   IconLabelBubbleView(const gfx::FontList& font_list, Delegate* delegate);
   ~IconLabelBubbleView() override;
 
@@ -103,7 +79,7 @@ class IconLabelBubbleView : public views::InkDropObserver,
   SkColor GetParentBackgroundColor() const;
 
   // Exposed for testing.
-  SeparatorView* separator_view() const { return separator_view_; }
+  views::View* separator_view() const { return separator_view_; }
 
   // Exposed for testing.
   bool is_animating_label() const { return slide_animation_.is_animating(); }
@@ -206,6 +182,24 @@ class IconLabelBubbleView : public views::InkDropObserver,
  private:
   class HighlightPathGenerator;
 
+  // A view that draws the separator.
+  class SeparatorView : public views::View {
+   public:
+    explicit SeparatorView(IconLabelBubbleView* owner);
+
+    // views::View:
+    void OnPaint(gfx::Canvas* canvas) override;
+
+    // Updates the opacity based on the ink drop's state.
+    void UpdateOpacity();
+
+   private:
+    // Weak.
+    IconLabelBubbleView* owner_;
+
+    DISALLOW_COPY_AND_ASSIGN(SeparatorView);
+  };
+
   // Spacing between the image and the label.
   int GetInternalSpacing() const;
 

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

@@ -11,6 +11,7 @@
 #include "chrome/test/views/chrome_views_test_base.h"
 #include "components/strings/grit/components_strings.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
 #include "ui/events/test/event_generator.h"
@@ -54,7 +55,6 @@ class TestIconLabelBubbleView : public IconLabelBubbleView {
         is_bubble_showing_(false) {
     GetImageView()->SetImageSize(gfx::Size(kImageSize, kImageSize));
     SetLabel(base::ASCIIToUTF16("Label"));
-    separator_view()->set_disable_animation_for_test(true);
   }
 
   void SetCurrentAnimationValue(int value) {
@@ -119,6 +119,9 @@ class TestIconLabelBubbleView : public IconLabelBubbleView {
   }
 
  private:
+  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> zero_duration_mode_ =
+      std::make_unique<ui::ScopedAnimationDurationScaleMode>(
+          ui::ScopedAnimationDurationScaleMode::ZERO_DURATION);
   int value_;
   bool is_bubble_showing_;
   DISALLOW_COPY_AND_ASSIGN(TestIconLabelBubbleView);