Add Chrome-specific subclass of TestViewsDelegate.

An in-progress patch caused tests to fail because ChromeLayoutProvider
was being requested when only a base LayoutProvider was available.
ChromeViewsTestBase, which I added earlier to make it easy to fix this
problem, didn't work in this case because the test was using
TestViewsDelegate directly.

This patch adds a ChromeTestViewsDelegate, and updates
ChromeViewsTestBase to use it. This patch also updates several test
suites to use one of those two classes.

Change-Id: Ie970cf35bde3eee14ccd4c52bc6ded2539a23e9c
Reviewed-on: https://chromium-review.googlesource.com/1036609Reviewed-by: Scott Violet <sky@chromium.org>
Commit-Queue: Bret Sepulveda <bsep@chromium.org>
Cr-Commit-Position: refs/heads/master@{#555191}

chrome/browser/ui/views/apps/app_info_dialog/app_info_permissions_panel_unittest.cc

@@ -12,9 +12,9 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/test_extension_system.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "extensions/common/extension_builder.h"
 #include "extensions/common/manifest.h"
@@ -24,7 +24,6 @@
 #include "testing/gmock/include/gmock/gmock-matchers.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
-#include "ui/views/test/test_views_delegate.h"
 
 namespace {
 
@@ -56,15 +55,9 @@ class AppInfoPermissionsPanelTest : public testing::Test {
         .Build();
   }
 
-  void SetUp() override {
-    // Set the ChromeLayoutProvider as the default layout provider.
-    views_delegate_.set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-  }
-
   // We need the UI thread in order to construct UI elements in the view.
   content::TestBrowserThreadBundle thread_bundle_;
-  views::TestViewsDelegate views_delegate_;
+  ChromeTestViewsDelegate views_delegate_;
   TestingProfile profile_;  // Needs BrowserThread::UI.
 };
 

chrome/browser/ui/views/bookmarks/bookmark_editor_view_unittest.cc

@@ -10,15 +10,14 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "components/bookmarks/browser/bookmark_model.h"
 #include "components/bookmarks/test/bookmark_test_helpers.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/controls/tree/tree_view.h"
-#include "ui/views/test/test_views_delegate.h"
 
 using base::ASCIIToUTF16;
 using base::UTF8ToUTF16;
@@ -35,9 +34,6 @@ class BookmarkEditorViewTest : public testing::Test {
     profile_.reset(new TestingProfile());
     profile_->CreateBookmarkModel(true);
 
-    views_delegate_.set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-
     model_ = BookmarkModelFactory::GetForBrowserContext(profile_.get());
     bookmarks::test::WaitForBookmarkModelToLoad(model_);
 
@@ -115,7 +111,6 @@ class BookmarkEditorViewTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
 
   BookmarkModel* model_;
-  views::TestViewsDelegate views_delegate_;
   std::unique_ptr<TestingProfile> profile_;
 
  private:
@@ -149,6 +144,8 @@ class BookmarkEditorViewTest : public testing::Test {
     model_->AddURL(of1, 0, ASCIIToUTF16("of1a"), GURL(test_base + "of1a"));
   }
 
+  ChromeTestViewsDelegate views_delegate_;
+
   std::unique_ptr<BookmarkEditorView> editor_;
 };
 

chrome/browser/ui/views/crypto_module_password_dialog_view_unittest.cc

@@ -9,24 +9,16 @@
 #include "base/bind.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/crypto_module_password_dialog.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.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"
 
-class CryptoModulePasswordDialogViewTest : public views::ViewsTestBase {
+class CryptoModulePasswordDialogViewTest : public ChromeViewsTestBase {
  public:
   CryptoModulePasswordDialogViewTest() {}
   ~CryptoModulePasswordDialogViewTest() override {}
 
-  // Overrides from views::ViewsTestBase:
-  void SetUp() override {
-    ViewsTestBase::SetUp();
-    // Set the ChromeLayoutProvider as the default layout provider.
-    test_views_delegate()->set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-  }
-
   void Capture(const std::string& text) {
     text_ = text;
   }

chrome/browser/ui/views/extensions/media_galleries_dialog_views_unittest.cc

@@ -10,11 +10,10 @@
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller_mock.h"
 #include "chrome/browser/ui/views/extensions/media_galleries_dialog_views.h"
 #include "chrome/browser/ui/views/extensions/media_gallery_checkbox_view.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "components/storage_monitor/storage_info.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/button/checkbox.h"
-#include "ui/views/test/test_views_delegate.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
@@ -49,8 +48,6 @@ class MediaGalleriesDialogTest : public testing::Test {
         WillByDefault(Return(headers));
     EXPECT_CALL(controller_, GetSectionEntries(_)).
         Times(AnyNumber());
-    test_views_delegate_.set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
   }
 
   void TearDown() override {
@@ -64,7 +61,7 @@ class MediaGalleriesDialogTest : public testing::Test {
  private:
   // TODO(gbillock): Get rid of this mock; make something specialized.
   NiceMock<MediaGalleriesDialogControllerMock> controller_;
-  views::TestViewsDelegate test_views_delegate_;
+  ChromeTestViewsDelegate test_views_delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogTest);
 };

chrome/browser/ui/views/global_error_bubble_view_unittest.cc

@@ -9,6 +9,7 @@
 
 #include "chrome/browser/ui/global_error/global_error.h"
 #include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/codec/png_codec.h"
@@ -17,7 +18,6 @@
 #include "ui/gfx/image/image_unittest_util.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/button/label_button.h"
-#include "ui/views/test/test_views_delegate.h"
 
 using ::testing::_;
 using ::testing::Return;
@@ -88,14 +88,8 @@ class GlobalErrorBubbleViewTest : public testing::Test {
             nullptr,
             mock_global_error_with_standard_bubble_->AsWeakPtr())) {}
 
-  void SetUp() override {
-    testing::Test::SetUp();
-    test_views_delegate_.set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-  }
-
  protected:
-  views::TestViewsDelegate test_views_delegate_;
+  ChromeTestViewsDelegate test_views_delegate_;
   std::unique_ptr<StrictMock<MockGlobalErrorWithStandardBubble>>
       mock_global_error_with_standard_bubble_;
   views::View arg_view_;

chrome/browser/ui/views/hover_button_unittest.cc

@@ -7,13 +7,12 @@
 #include <memory>
 
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+#include "chrome/test/views/chrome_views_test_base.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/gfx/text_utils.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/label.h"
-#include "ui/views/test/test_views_delegate.h"
 #include "ui/views/test/views_test_base.h"
 #include "ui/views/view.h"
 
@@ -41,7 +40,7 @@ constexpr TitleSubtitlePair kTitleSubtitlePairs[] = {
      "If you're happy and you know it, clap your hands!", true},
 };
 
-class HoverButtonTest : public views::ViewsTestBase {
+class HoverButtonTest : public ChromeViewsTestBase {
  public:
   HoverButtonTest() {}
 
@@ -51,15 +50,6 @@ class HoverButtonTest : public views::ViewsTestBase {
     return icon;
   }
 
-  // views::ViewsTestBase:
-  void SetUp() override {
-    ViewsTestBase::SetUp();
-    // HoverButton uses Chrome-specific layout constants, so make sure these
-    // exist for testing.
-    test_views_delegate()->set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-  }
-
  private:
   DISALLOW_COPY_AND_ASSIGN(HoverButtonTest);
 };

chrome/browser/ui/views/toolbar/reload_button_unittest.cc

@@ -7,9 +7,9 @@
 #include "base/run_loop.h"
 #include "chrome/test/base/chrome_render_view_host_test_harness.h"
 #include "chrome/test/base/testing_profile.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/events/event_utils.h"
-#include "ui/views/test/test_views_delegate.h"
 
 class ReloadButtonTest : public ChromeRenderViewHostTestHarness {
  public:
@@ -31,7 +31,7 @@ class ReloadButtonTest : public ChromeRenderViewHostTestHarness {
   ReloadButton* reload() { return &reload_; }
 
  private:
-  views::TestViewsDelegate views_delegate_;
+  ChromeTestViewsDelegate views_delegate_;
   ReloadButton reload_;
 
   DISALLOW_COPY_AND_ASSIGN(ReloadButtonTest);

chrome/browser/ui/views/toolbar/toolbar_actions_bar_bubble_views_unittest.cc

@@ -10,8 +10,8 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/toolbar/test_toolbar_actions_bar_bubble_delegate.h"
 #include "chrome/browser/ui/toolbar/toolbar_actions_bar_bubble_delegate.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/vector_icons/vector_icons.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -24,7 +24,6 @@
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/link.h"
 #include "ui/views/test/test_widget_observer.h"
-#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 
@@ -32,7 +31,7 @@ namespace {
 const int kIconSize = 16;
 }
 
-class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase {
+class ToolbarActionsBarBubbleViewsTest : public ChromeViewsTestBase {
  public:
   views::View* TestCreateExtraView() {
     DCHECK(bubble_);
@@ -43,15 +42,9 @@ class ToolbarActionsBarBubbleViewsTest : public views::ViewsTestBase {
   ToolbarActionsBarBubbleViewsTest() {}
   ~ToolbarActionsBarBubbleViewsTest() override {}
 
-  void SetUp() override {
-    views::ViewsTestBase::SetUp();
-    test_views_delegate()->set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
-  }
-
   void TearDown() override {
     anchor_widget_.reset();
-    views::ViewsTestBase::TearDown();
+    ChromeViewsTestBase::TearDown();
   }
 
   std::unique_ptr<views::Widget> CreateAnchorWidget() {

chrome/browser/ui/views/translate/translate_bubble_view_unittest.cc

@@ -12,8 +12,8 @@
 #include "build/build_config.h"
 #include "chrome/browser/ui/translate/translate_bubble_model.h"
 #include "chrome/browser/ui/translate/translate_bubble_view_state_transition.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/grit/generated_resources.h"
+#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/translate/core/browser/translate_prefs.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -26,7 +26,6 @@
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/styled_label.h"
-#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 
 
@@ -151,16 +150,13 @@ class MockTranslateBubbleModel : public TranslateBubbleModel {
 
 }  // namespace
 
-class TranslateBubbleViewTest : public views::ViewsTestBase {
+class TranslateBubbleViewTest : public ChromeViewsTestBase {
  public:
   TranslateBubbleViewTest() {}
 
  protected:
   void SetUp() override {
-    views::ViewsTestBase::SetUp();
-    // Set the ChromeLayoutProvider as the default layout provider.
-    test_views_delegate()->set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
+    ChromeViewsTestBase::SetUp();
 
     // The bubble needs the parent as an anchor.
     views::Widget::InitParams params =
@@ -196,7 +192,7 @@ class TranslateBubbleViewTest : public views::ViewsTestBase {
     bubble_->GetWidget()->CloseNow();
     anchor_widget_.reset();
 
-    views::ViewsTestBase::TearDown();
+    ChromeViewsTestBase::TearDown();
   }
 
   bool denial_button_clicked() { return mock_model_->translation_declined_; }

chrome/browser/ui/views/webshare/webshare_target_picker_view_unittest.cc

@@ -15,12 +15,11 @@
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/views/chrome_constrained_window_views_client.h"
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
+#include "chrome/test/views/chrome_views_test_base.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/controls/table/table_view.h"
-#include "ui/views/test/views_test_base.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_client_view.h"
 #include "ui/views/window/dialog_delegate.h"
@@ -32,15 +31,12 @@ constexpr char kTemplate[] = "share?title={title}";
 constexpr char kUrl1[] = "https://appone.com/path/bits";
 constexpr char kUrl2[] = "https://apptwo.xyz";
 
-class WebShareTargetPickerViewTest : public views::ViewsTestBase {
+class WebShareTargetPickerViewTest : public ChromeViewsTestBase {
  public:
   WebShareTargetPickerViewTest() {}
 
   void SetUp() override {
-    ViewsTestBase::SetUp();
-
-    test_views_delegate()->set_layout_provider(
-        ChromeLayoutProvider::CreateLayoutProvider());
+    ChromeViewsTestBase::SetUp();
 
     SetConstrainedWindowViewsClient(CreateChromeConstrainedWindowViewsClient());
 
@@ -61,7 +57,7 @@ class WebShareTargetPickerViewTest : public views::ViewsTestBase {
     quit_closure_ = base::Closure();
     constrained_window::SetConstrainedWindowViewsClient(nullptr);
 
-    ViewsTestBase::TearDown();
+    ChromeViewsTestBase::TearDown();
   }
 
  protected:

chrome/test/BUILD.gn

@@ -255,6 +255,8 @@ static_library("test_support") {
       "../browser/ui/views/media_router/app_menu_test_api.h",
       "views/accessibility_checker.cc",
       "views/accessibility_checker.h",
+      "views/chrome_test_views_delegate.cc",
+      "views/chrome_test_views_delegate.h",
       "views/chrome_views_test_base.cc",
       "views/chrome_views_test_base.h",
       "views/scoped_macviews_browser_mode.cc",

chrome/test/views/chrome_test_views_delegate.cc

+// Copyright 2018 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/test/views/chrome_test_views_delegate.h"
+
+#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+
+ChromeTestViewsDelegate::ChromeTestViewsDelegate()
+    : views::TestViewsDelegate() {
+  // Overrides the LayoutProvider created by TestViewsDelegate.
+  set_layout_provider(std::make_unique<ChromeLayoutProvider>());
+}
+
+ChromeTestViewsDelegate::~ChromeTestViewsDelegate() {}

chrome/test/views/chrome_test_views_delegate.h

+// Copyright 2018 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.
+
+#ifndef CHROME_TEST_VIEWS_CHROME_TEST_VIEWS_DELEGATE_H_
+#define CHROME_TEST_VIEWS_CHROME_TEST_VIEWS_DELEGATE_H_
+
+#include "base/macros.h"
+#include "ui/views/test/test_views_delegate.h"
+
+// A TestViewsDelegate specific to Chrome tests.
+class ChromeTestViewsDelegate : public views::TestViewsDelegate {
+ public:
+  ChromeTestViewsDelegate();
+  ~ChromeTestViewsDelegate() override;
+
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ChromeTestViewsDelegate);
+};
+
+#endif  // CHROME_TEST_VIEWS_CHROME_TEST_VIEWS_DELEGATE_H_

chrome/test/views/chrome_views_test_base.cc

@@ -4,13 +4,13 @@
 
 #include "chrome/test/views/chrome_views_test_base.h"
 
-#include "chrome/browser/ui/views/harmony/chrome_layout_provider.h"
+#include "chrome/test/views/chrome_test_views_delegate.h"
 
 ChromeViewsTestBase::ChromeViewsTestBase() {}
 
 ChromeViewsTestBase::~ChromeViewsTestBase() {}
 
 void ChromeViewsTestBase::SetUp() {
+  set_views_delegate(std::make_unique<ChromeTestViewsDelegate>());
   views::ViewsTestBase::SetUp();
-  provider_ = std::make_unique<ChromeLayoutProvider>();
 }

chrome/test/views/chrome_views_test_base.h

@@ -10,8 +10,6 @@
 #include "base/macros.h"
 #include "ui/views/test/views_test_base.h"
 
-class ChromeLayoutProvider;
-
 // A base class for Chrome views unit tests. Changes the dependencies when they
 // need to be different than non-Chrome views.
 class ChromeViewsTestBase : public views::ViewsTestBase {
@@ -23,10 +21,6 @@ class ChromeViewsTestBase : public views::ViewsTestBase {
   void SetUp() override;
 
  private:
-  // Overrides the LayoutProvider created by ViewsTestBase (via
-  // TestViewsDelegate).
-  std::unique_ptr<ChromeLayoutProvider> provider_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeViewsTestBase);
 };