Remove last MD reference from TrayPopupUtils.

ui/views/controls/slider_unittest.cc

 // Copyright (c) 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 "ui/views/controls/slider.h"
 
 #include <memory>
 #include <string>
 
 #include "base/i18n/rtl.h"
 #include "base/macros.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event.h"
 #include "ui/events/gesture_event_details.h"
 #include "ui/events/keycodes/keyboard_codes.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/test/slider_test_api.h"
-#include "ui/views/test/test_slider.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 namespace {
 
 // A views::SliderListener that tracks simple event call history.
 class TestSliderListener : public views::SliderListener {
  public:
@@ skipping 143 matching lines @@
 
 SliderTest::SliderTest()
     : slider_(NULL), default_locale_(), max_x_(0), max_y_(0) {}
 
 SliderTest::~SliderTest() {
 }
 
 void SliderTest::SetUp() {
   views::ViewsTestBase::SetUp();
 
-  slider_ = new TestSlider(nullptr);
+  slider_ = new Slider(nullptr);
   View* view = slider_;
   gfx::Size size = view->GetPreferredSize();
   view->SetSize(size);
   max_x_ = size.width() - 1;
   max_y_ = size.height() - 1;
   default_locale_ = base::i18n::GetConfiguredLocale();
 
   views::Widget::InitParams init_params(CreateParams(
         views::Widget::InitParams::TYPE_WINDOW_FRAMELESS));
   init_params.bounds = gfx::Rect(size);
@@ skipping 15 matching lines @@
 
   views::ViewsTestBase::TearDown();
 }
 
 void SliderTest::ClickAt(int x, int y) {
   gfx::Point point(x, y);
   event_generator_->MoveMouseTo(point);
   event_generator_->ClickLeftButton();
 }
 
-// Test fixture for horizontally oriented slider tests.
-class HorizontalSliderTest : public SliderTest {
- public:
-  HorizontalSliderTest();
-  ~HorizontalSliderTest() override;
-
- private:
-  DISALLOW_COPY_AND_ASSIGN(HorizontalSliderTest);
-};
-
-HorizontalSliderTest::HorizontalSliderTest() : SliderTest() {}
-
-HorizontalSliderTest::~HorizontalSliderTest() {
-}
-
-TEST_F(HorizontalSliderTest, UpdateFromClickHorizontal) {
+TEST_F(SliderTest, UpdateFromClickHorizontal) {
   ClickAt(0, 0);
   EXPECT_EQ(0.0f, slider()->value());
 
   ClickAt(max_x(), 0);
   EXPECT_EQ(1.0f, slider()->value());
 }
 
-
-TEST_F(HorizontalSliderTest, UpdateFromClickRTLHorizontal) {
+TEST_F(SliderTest, UpdateFromClickRTLHorizontal) {
   base::i18n::SetICUDefaultLocale("he");
 
   ClickAt(0, 0);
   EXPECT_EQ(1.0f, slider()->value());
 
   ClickAt(max_x(), 0);
   EXPECT_EQ(0.0f, slider()->value());
 }
 
 // No touch on desktop Mac. Tracked in http://crbug.com/445520.
 #if !defined(OS_MACOSX) || defined(USE_AURA)
 
 // Test the slider location after a tap gesture.
-TEST_F(HorizontalSliderTest, SliderValueForTapGesture) {
+TEST_F(SliderTest, SliderValueForTapGesture) {
   // Tap below the minimum.
   slider()->SetValue(0.5);
   event_generator()->GestureTapAt(gfx::Point(0, 0));
   EXPECT_FLOAT_EQ(0, slider()->value());
 
   // Tap above the maximum.
   slider()->SetValue(0.5);
   event_generator()->GestureTapAt(gfx::Point(max_x(), max_y()));
   EXPECT_FLOAT_EQ(1, slider()->value());
 
   // Tap somwhere in the middle.
   slider()->SetValue(0.5);
   event_generator()->GestureTapAt(gfx::Point(0.75 * max_x(), 0.75 * max_y()));
   EXPECT_NEAR(0.75, slider()->value(), 0.03);
 }
 
 // Test the slider location after a scroll gesture.
-TEST_F(HorizontalSliderTest, SliderValueForScrollGesture) {
+TEST_F(SliderTest, SliderValueForScrollGesture) {
   // Scroll below the minimum.
   slider()->SetValue(0.5);
   event_generator()->GestureScrollSequence(
     gfx::Point(0.5 * max_x(), 0.5 * max_y()),
     gfx::Point(0, 0),
     base::TimeDelta::FromMilliseconds(10),
     5 /* steps */);
   EXPECT_EQ(0, slider()->value());
 
   // Scroll above the maximum.
   slider()->SetValue(0.5);
   event_generator()->GestureScrollSequence(
       gfx::Point(0.5 * max_x(), 0.5 * max_y()), gfx::Point(max_x(), max_y()),
       base::TimeDelta::FromMilliseconds(10), 5 /* steps */);
   EXPECT_EQ(1, slider()->value());
 
   // Scroll somewhere in the middle.
   slider()->SetValue(0.25);
   event_generator()->GestureScrollSequence(
     gfx::Point(0.25 * max_x(), 0.25 * max_y()),
     gfx::Point(0.75 * max_x(), 0.75 * max_y()),
     base::TimeDelta::FromMilliseconds(10),
     5 /* steps */);
   EXPECT_NEAR(0.75, slider()->value(), 0.03);
 }
 
 // Test the slider location by adjusting it using keyboard.
-TEST_F(HorizontalSliderTest, SliderValueForKeyboard) {
-  float value =0.5;
+TEST_F(SliderTest, SliderValueForKeyboard) {
+  float value = 0.5;
   slider()->SetValue(value);
   slider()->RequestFocus();
   event_generator()->PressKey(ui::VKEY_RIGHT, 0);
   EXPECT_GT(slider()->value(), value);
 
   slider()->SetValue(value);
   event_generator()->PressKey(ui::VKEY_LEFT, 0);
   EXPECT_LT(slider()->value(), value);
 }
 
 // Verifies the correct SliderListener events are raised for a tap gesture.
-TEST_F(HorizontalSliderTest, SliderListenerEventsForTapGesture) {
+TEST_F(SliderTest, SliderListenerEventsForTapGesture) {
   test::SliderTestApi slider_test_api(slider());
   slider_test_api.SetListener(&slider_listener());
 
   event_generator()->GestureTapAt(gfx::Point(0, 0));
   EXPECT_EQ(1, slider_listener().last_drag_started_epoch());
   EXPECT_EQ(2, slider_listener().last_drag_ended_epoch());
   EXPECT_EQ(slider(), slider_listener().last_drag_started_sender());
   EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender());
 }
 
 // Verifies the correct SliderListener events are raised for a scroll gesture.
-TEST_F(HorizontalSliderTest, SliderListenerEventsForScrollGesture) {
+TEST_F(SliderTest, SliderListenerEventsForScrollGesture) {
   test::SliderTestApi slider_test_api(slider());
   slider_test_api.SetListener(&slider_listener());
 
   event_generator()->GestureScrollSequence(
     gfx::Point(0.25 * max_x(), 0.25 * max_y()),
     gfx::Point(0.75 * max_x(), 0.75 * max_y()),
     base::TimeDelta::FromMilliseconds(0),
     5 /* steps */);
 
   EXPECT_EQ(1, slider_listener().last_drag_started_epoch());
   EXPECT_GT(slider_listener().last_drag_ended_epoch(),
             slider_listener().last_drag_started_epoch());
   EXPECT_EQ(slider(), slider_listener().last_drag_started_sender());
   EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender());
 }
 
 // Verifies the correct SliderListener events are raised for a multi
 // finger scroll gesture.
-TEST_F(HorizontalSliderTest, SliderListenerEventsForMultiFingerScrollGesture) {
+TEST_F(SliderTest, SliderListenerEventsForMultiFingerScrollGesture) {
   test::SliderTestApi slider_test_api(slider());
   slider_test_api.SetListener(&slider_listener());
 
   gfx::Point points[] = {gfx::Point(0, 0.1 * max_y()),
                          gfx::Point(0, 0.2 * max_y())};
   event_generator()->GestureMultiFingerScroll(2 /* count */, points,
       0 /* event_separation_time_ms */, 5 /* steps */,
       2 /* move_x */, 0 /* move_y */);
 
   EXPECT_EQ(1, slider_listener().last_drag_started_epoch());
   EXPECT_GT(slider_listener().last_drag_ended_epoch(),
             slider_listener().last_drag_started_epoch());
   EXPECT_EQ(slider(), slider_listener().last_drag_started_sender());
   EXPECT_EQ(slider(), slider_listener().last_drag_ended_sender());
 }
 
 #endif  // !defined(OS_MACOSX) || defined(USE_AURA)
 
 }  // namespace views