Revert "Convert chrome/ tests using ViewsTestBase to ChromeViewsTestBase."

This reverts commit ed47f31b.

Reason for revert: All tests from TabTest reported flaky crbug.com/859718

Original change's description:
> Convert chrome/ tests using ViewsTestBase to ChromeViewsTestBase.
> 
> This ensures these tests are testing the actual harmony/refresh behavior, and
> makes sure as people add more calls to ChromeLayoutProvider to the code they
> don't result in unexpected test crashes.
> 
> Bug: none
> Change-Id: If21b7eec387dc47be448e2dbb2730ddacb7b51fe
> Reviewed-on: https://chromium-review.googlesource.com/1121787
> Commit-Queue: Peter Kasting <pkasting@chromium.org>
> Reviewed-by: Lei Zhang <thestig@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#572008}

TBR=pkasting@chromium.org,thestig@chromium.org

Change-Id: Ib0d68d4aaff4a8617b95f4456eef0dad9f66e57b
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: none
Reviewed-on: https://chromium-review.googlesource.com/1123839Reviewed-by: Luciano Pacheco <lucmult@chromium.org>
Commit-Queue: Luciano Pacheco <lucmult@chromium.org>
Cr-Commit-Position: refs/heads/master@{#572070}

chrome/browser/chromeos/arc/accessibility/arc_accessibility_helper_bridge_unittest.cc

@@ -18,7 +18,6 @@
 #include "base/observer_list.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/test/base/testing_profile.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "chromeos/chromeos_switches.h"
 #include "components/arc/arc_bridge_service.h"
 #include "components/arc/common/accessibility_helper.mojom.h"
@@ -29,6 +28,7 @@
 #include "ui/display/display.h"
 #include "ui/display/manager/managed_display_info.h"
 #include "ui/message_center/public/cpp/notification.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
@@ -47,7 +47,7 @@ constexpr char kNotificationKey[] = "unit.test.notification";
 
 }  // namespace
 
-class ArcAccessibilityHelperBridgeTest : public ChromeViewsTestBase {
+class ArcAccessibilityHelperBridgeTest : public views::ViewsTestBase {
  public:
   class TestArcAccessibilityHelperBridge : public ArcAccessibilityHelperBridge {
    public:
@@ -117,7 +117,7 @@ class ArcAccessibilityHelperBridgeTest : public ChromeViewsTestBase {
   ArcAccessibilityHelperBridgeTest() = default;
 
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
 
     testing_profile_ = std::make_unique<TestingProfile>();
     bridge_service_ = std::make_unique<ArcBridgeService>();
@@ -135,7 +135,7 @@ class ArcAccessibilityHelperBridgeTest : public ChromeViewsTestBase {
     bridge_service_.reset();
     testing_profile_.reset();
 
-    ChromeViewsTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
   TestArcAccessibilityHelperBridge* accessibility_helper_bridge() {

chrome/browser/media/webrtc/native_desktop_media_list_unittest.cc

@@ -18,7 +18,6 @@
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_task_runner_handle.h"
 #include "chrome/browser/media/webrtc/desktop_media_list_observer.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ -26,6 +25,7 @@
 #include "third_party/webrtc/modules/desktop_capture/desktop_frame.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/widget/widget.h"
 
@@ -166,7 +166,7 @@ ACTION_P2(QuitRunLoop, task_runner, run_loop) {
   task_runner->PostTask(FROM_HERE, run_loop->QuitWhenIdleClosure());
 }
 
-class NativeDesktopMediaListTest : public ChromeViewsTestBase {
+class NativeDesktopMediaListTest : public views::ViewsTestBase {
  public:
   NativeDesktopMediaListTest() = default;
 
@@ -174,7 +174,7 @@ class NativeDesktopMediaListTest : public ChromeViewsTestBase {
     for (size_t i = 0; i < desktop_widgets_.size(); i++)
       desktop_widgets_[i].reset();
 
-    ChromeViewsTestBase::TearDown();
+    ViewsTestBase::TearDown();
   }
 
   void AddNativeWindow(int id) {

chrome/browser/ui/views/autofill/autofill_popup_view_native_views_unittest.cc

@@ -11,7 +11,7 @@
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "chrome/browser/ui/autofill/autofill_popup_layout_model.h"
 #include "chrome/browser/ui/views/autofill/autofill_popup_view_native_views.h"
-#include "chrome/test/views/chrome_views_test_base.h"
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "components/autofill/core/browser/popup_item_ids.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -20,6 +20,7 @@
 #include "ui/aura/test/aura_test_base.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/test/event_generator.h"
+#include "ui/views/test/views_test_base.h"
 
 namespace {
 
@@ -111,13 +112,18 @@ class MockAutofillPopupController : public autofill::AutofillPopupController {
   std::vector<autofill::Suggestion> suggestions_;
 };
 
-class AutofillPopupViewNativeViewsTest : public ChromeViewsTestBase {
+class AutofillPopupViewNativeViewsTest : public views::ViewsTestBase {
  public:
   AutofillPopupViewNativeViewsTest() = default;
   ~AutofillPopupViewNativeViewsTest() override = default;
 
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
+
+    // The layout provider is meant to be a singleton, but it is not initialized
+    // for unit tests. Constructing one here makes it globally available, which
+    // is later used by the view during initialization.
+    layout_provider_ = std::make_unique<ChromeLayoutProvider>();
 
     CreateWidget();
     generator_.reset(new ui::test::EventGenerator(widget_.GetNativeWindow()));
@@ -128,7 +134,7 @@ class AutofillPopupViewNativeViewsTest : public ChromeViewsTestBase {
     if (!widget_.IsClosed())
       widget_.Close();
     view_.reset();
-    ChromeViewsTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
   void CreateAndShowView(const std::vector<int>& ids) {
@@ -157,6 +163,7 @@ class AutofillPopupViewNativeViewsTest : public ChromeViewsTestBase {
   std::unique_ptr<ui::test::EventGenerator> generator_;
 
  private:
+  std::unique_ptr<ChromeLayoutProvider> layout_provider_;
   DISALLOW_COPY_AND_ASSIGN(AutofillPopupViewNativeViewsTest);
 };
 

chrome/browser/ui/views/download/download_item_view_unittest.cc

@@ -5,11 +5,11 @@
 #include "chrome/browser/ui/views/download/download_item_view.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/test/views_test_base.h"
 
-using DownloadItemViewDangerousDownloadLabelTest = ChromeViewsTestBase;
+using DownloadItemViewDangerousDownloadLabelTest = views::ViewsTestBase;
 
 TEST_F(DownloadItemViewDangerousDownloadLabelTest, AdjustTextAndGetSize) {
   // For very short label that can fit in a single line, no need to do any

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

@@ -9,9 +9,9 @@
 #include "base/macros.h"
 #include "chrome/browser/ui/layout_constants.h"
 #include "chrome/browser/ui/views/nav_button_provider.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/test/views_test_base.h"
 
 namespace {
 
@@ -132,13 +132,13 @@ class TestNavButtonProvider : public views::NavButtonProvider {
 
 }  // namespace
 
-class DesktopLinuxBrowserFrameViewLayoutTest : public ChromeViewsTestBase {
+class DesktopLinuxBrowserFrameViewLayoutTest : public views::ViewsTestBase {
  public:
   DesktopLinuxBrowserFrameViewLayoutTest() {}
   ~DesktopLinuxBrowserFrameViewLayoutTest() override {}
 
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
 
     delegate_.reset(new TestLayoutDelegate);
     nav_button_provider_ = std::make_unique<::TestNavButtonProvider>();
@@ -162,7 +162,7 @@ class DesktopLinuxBrowserFrameViewLayoutTest : public ChromeViewsTestBase {
   void TearDown() override {
     widget_->CloseNow();
 
-    ChromeViewsTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
  protected:

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

@@ -11,7 +11,6 @@
 #include "chrome/browser/ui/views/profiles/profile_indicator_icon.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "chrome/common/chrome_switches.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/signin/core/browser/profile_management_switches.h"
 #include "ui/base/material_design/material_design_controller.h"
 #include "ui/gfx/image/image_skia.h"
@@ -20,6 +19,7 @@
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/test/views_test_base.h"
 
 namespace {
 
@@ -88,13 +88,13 @@ class TestLayoutDelegate : public OpaqueBrowserFrameViewLayoutDelegate {
 
 }  // namespace
 
-class OpaqueBrowserFrameViewLayoutTest : public ChromeViewsTestBase {
+class OpaqueBrowserFrameViewLayoutTest : public views::ViewsTestBase {
  public:
   OpaqueBrowserFrameViewLayoutTest() {}
   ~OpaqueBrowserFrameViewLayoutTest() override {}
 
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
 
     delegate_.reset(new TestLayoutDelegate);
     auto layout = std::make_unique<OpaqueBrowserFrameViewLayout>();
@@ -131,7 +131,7 @@ class OpaqueBrowserFrameViewLayoutTest : public ChromeViewsTestBase {
   void TearDown() override {
     widget_->CloseNow();
 
-    ChromeViewsTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
  protected:

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

@@ -7,7 +7,6 @@
 #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 "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/gesture_detection/gesture_configuration.h"
@@ -15,6 +14,7 @@
 #include "ui/views/animation/test/ink_drop_host_view_test_api.h"
 #include "ui/views/animation/test/test_ink_drop.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/views/test/views_test_base.h"
 
 #if defined(OS_CHROMEOS)
 #include "ui/aura/window.h"
@@ -118,11 +118,24 @@ class TestIconLabelBubbleView : public IconLabelBubbleView {
 
 }  // namespace
 
-class IconLabelBubbleViewTest : public ChromeViewsTestBase {
+class IconLabelBubbleViewTest : public views::ViewsTestBase {
+ public:
+  IconLabelBubbleViewTest()
+      : views::ViewsTestBase(),
+        widget_(nullptr),
+        view_(nullptr),
+        ink_drop_(nullptr),
+        steady_reached_(false),
+        shrinking_reached_(false),
+        minimum_size_reached_(false),
+        previous_width_(0),
+        initial_image_x_(0) {}
+  ~IconLabelBubbleViewTest() override {}
+
  protected:
-  // ChromeViewsTestBase:
+  // views::ViewsTestBase:
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    views::ViewsTestBase::SetUp();
     gfx::FontList font_list;
 
     CreateWidget();
@@ -139,7 +152,7 @@ class IconLabelBubbleViewTest : public ChromeViewsTestBase {
     if (widget_ && !widget_->IsClosed())
       widget_->Close();
 
-    ChromeViewsTestBase::TearDown();
+    ViewsTestBase::TearDown();
   }
 
   void VerifyWithAnimationStep(int step) {
@@ -252,16 +265,16 @@ class IconLabelBubbleViewTest : public ChromeViewsTestBase {
     return view_->GetImageView()->bounds();
   }
 
-  views::Widget* widget_ = nullptr;
-  TestIconLabelBubbleView* view_ = nullptr;
-  TestInkDrop* ink_drop_ = nullptr;
+  views::Widget* widget_;
+  TestIconLabelBubbleView* view_;
+  TestInkDrop* ink_drop_;
   std::unique_ptr<ui::test::EventGenerator> generator_;
 
-  bool steady_reached_ = false;
-  bool shrinking_reached_ = false;
-  bool minimum_size_reached_ = false;
-  int previous_width_ = 0;
-  int initial_image_x_ = 0;
+  bool steady_reached_;
+  bool shrinking_reached_;
+  bool minimum_size_reached_;
+  int previous_width_;
+  int initial_image_x_;
 };
 
 // Tests layout rules for IconLabelBubbleView while simulating animation.
@@ -364,7 +377,7 @@ TEST_F(IconLabelBubbleViewTest, GestureInkDropState) {
 #if defined(OS_CHROMEOS)
 // Verifies IconLabelBubbleView::CalculatePreferredSize() doesn't crash when
 // there is a widget but no compositor.
-using IconLabelBubbleViewCrashTest = ChromeViewsTestBase;
+using IconLabelBubbleViewCrashTest = views::ViewsTestBase;
 
 TEST_F(IconLabelBubbleViewCrashTest,
        GetPreferredSizeDoesntCrashWhenNoCompositor) {

chrome/browser/ui/views/omnibox/omnibox_result_view_unittest.cc

@@ -8,7 +8,6 @@
 
 #include "chrome/browser/ui/omnibox/omnibox_theme.h"
 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/omnibox/browser/omnibox_edit_model.h"
 #include "components/omnibox/browser/test_omnibox_client.h"
 #include "content/public/test/test_browser_thread_bundle.h"
@@ -18,6 +17,7 @@
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 #include "ui/gfx/image/image.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 namespace {
@@ -49,10 +49,10 @@ class TestOmniboxPopupContentsView : public OmniboxPopupContentsView {
 
 }  // namespace
 
-class OmniboxResultViewTest : public ChromeViewsTestBase {
+class OmniboxResultViewTest : public views::ViewsTestBase {
  public:
   void SetUp() override {
-    ChromeViewsTestBase::SetUp();
+    ViewsTestBase::SetUp();
 
     edit_model_ = std::make_unique<OmniboxEditModel>(
         nullptr, nullptr, std::make_unique<TestOmniboxClient>());
@@ -77,7 +77,7 @@ class OmniboxResultViewTest : public ChromeViewsTestBase {
 
   void TearDown() override {
     widget_.reset();
-    ChromeViewsTestBase::TearDown();
+    views::ViewsTestBase::TearDown();
   }
 
   ui::MouseEvent CreateEvent(ui::EventType type, int flags) {

chrome/browser/ui/views/payments/validating_textfield_unittest.cc

@@ -11,13 +11,13 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/payments/validation_delegate.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/textfield/textfield.h"
+#include "ui/views/test/views_test_base.h"
 
 namespace payments {
 
-class ValidatingTextfieldTest : public ChromeViewsTestBase {
+class ValidatingTextfieldTest : public views::ViewsTestBase {
  public:
   ValidatingTextfieldTest() {}
   ~ValidatingTextfieldTest() override {}

chrome/browser/ui/views/payments/view_stack_unittest.cc

@@ -7,8 +7,8 @@
 #include "base/observer_list.h"
 #include "base/run_loop.h"
 #include "chrome/browser/ui/views/payments/view_stack.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "ui/gfx/animation/test_animation_delegate.h"
+#include "ui/views/test/views_test_base.h"
 
 class TestStackView : public views::View {
  public:
@@ -43,7 +43,7 @@ class TestStackView : public views::View {
   DISALLOW_COPY_AND_ASSIGN(TestStackView);
 };
 
-class ViewStackTest : public ChromeViewsTestBase {
+class ViewStackTest : public views::ViewsTestBase {
  public:
   ViewStackTest() : view_stack_(std::make_unique<ViewStack>()) {
     view_stack_->SetBounds(0, 0, 10, 10);

chrome/browser/ui/views/sync/bubble_sync_promo_view_unittest.cc

@@ -12,14 +12,14 @@
 #include "chrome/browser/ui/sync/bubble_sync_promo_delegate.h"
 #include "chrome/grit/chromium_strings.h"
 #include "chrome/grit/generated_resources.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/signin/core/browser/account_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_constants.h"
 #include "ui/gfx/range/range.h"
 #include "ui/views/controls/styled_label.h"
+#include "ui/views/test/views_test_base.h"
 
-class BubbleSyncPromoViewTest : public ChromeViewsTestBase,
+class BubbleSyncPromoViewTest : public views::ViewsTestBase,
                                 public BubbleSyncPromoDelegate {
  public:
   BubbleSyncPromoViewTest() {}

chrome/browser/ui/views/tabs/tab_unittest.cc

@@ -15,13 +15,13 @@
 #include "chrome/browser/ui/views/tabs/tab_controller.h"
 #include "chrome/browser/ui/views/tabs/tab_icon.h"
 #include "chrome/grit/theme_resources.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/models/list_selection_model.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/favicon_size.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 using views::Widget;
@@ -110,7 +110,7 @@ class FakeTabController : public TabController {
   DISALLOW_COPY_AND_ASSIGN(FakeTabController);
 };
 
-class TabTest : public ChromeViewsTestBase {
+class TabTest : public views::ViewsTestBase {
  public:
   TabTest() {}
   ~TabTest() override {}

chrome/test/views/accessibility_checker_unittest.cc

@@ -5,14 +5,14 @@
 #include "chrome/test/views/accessibility_checker.h"
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest-spi.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/button/image_button.h"
+#include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
-using AccessibilityCheckerTest = ChromeViewsTestBase;
+typedef views::ViewsTestBase AccessibilityCheckerTest;
 
 // Test that a view that is not accessible will fail the accessibility audit.
 TEST_F(AccessibilityCheckerTest, VerifyAccessibilityCheckerFailAndPass) {