polychrome: fix FindInPageControllerTest suite

These tests were broken by conflicting definitions of
chrome::DisableFindBarAnimationsDuringTesting. This change fixes that conflict
by having the Views version call the Cocoa version when needed. After this
change, all FindInPageControllerTest tests pass in cocoa and polychrome-cocoa,
and most pass in polychrome-views.

Bug: 817408
Change-Id: I7d028e57502b29a2303164662dea05bb6641c142
Reviewed-on: https://chromium-review.googlesource.com/962713
Commit-Queue: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Sarah Chan <spqchan@chromium.org>
Cr-Commit-Position: refs/heads/master@{#543160}

chrome/browser/ui/BUILD.gn

@@ -3901,15 +3901,16 @@ static_library("test_support") {
       "views/toolbar/browser_action_test_util_views_mac.mm",
     ]
     if (is_mac) {
-      sources += [ "cocoa/extensions/browser_action_test_util_views_cocoa.mm" ]
+      sources += [
+        "cocoa/extensions/browser_action_test_util_views_cocoa.mm",
+        "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm",
+      ]
     }
     if (!is_mac || mac_views_browser) {
       sources += [
         "views/find_bar_host_unittest_util_views.cc",
         "views/toolbar/browser_action_test_util_views.cc",
       ]
-    } else {
-      sources += [ "cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm" ]
     }
     if (use_aura) {
       sources += [ "views/toolbar/browser_action_test_util_views_aura.cc" ]

chrome/browser/ui/cocoa/find_bar/find_bar_host_unittest_util_cocoa.mm

@@ -4,12 +4,20 @@
 
 #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h"
 
+#include "build/buildflag.h"
 #include "chrome/browser/ui/cocoa/find_bar/find_bar_bridge.h"
+#include "ui/base/ui_features.h"
 
 namespace chrome {
 
-void DisableFindBarAnimationsDuringTesting(bool /* disable */) {
+void DisableFindBarCocoaAnimationsDuringTesting(bool /* disable */) {
   FindBarBridge::disable_animations_during_testing_ = true;
 }
 
+#if !BUILDFLAG(MAC_VIEWS_BROWSER)
+void DisableFindBarAnimationsDuringTesting(bool disable) {
+  DisableFindBarCocoaAnimationsDuringTesting(disable);
+}
+#endif
+
 }  // namespace chrome

chrome/browser/ui/find_bar/find_bar_host_unittest_util.h

@@ -9,8 +9,11 @@
 
 namespace chrome {
 
-#if defined(TOOLKIT_VIEWS) || defined(OS_MACOSX)
+#if defined(TOOLKIT_VIEWS)
 void DisableFindBarAnimationsDuringTesting(bool disable);
+#if defined(OS_MACOSX)
+void DisableFindBarCocoaAnimationsDuringTesting(bool disable);
+#endif
 #else
 static inline void DisableFindBarAnimationsDuringTesting(bool disable) {}
 #endif

chrome/browser/ui/views/find_bar_host_unittest_util_views.cc

@@ -4,12 +4,20 @@
 
 #include "chrome/browser/ui/find_bar/find_bar_host_unittest_util.h"
 
+#include "build/build_config.h"
+#include "build/buildflag.h"
 #include "chrome/browser/ui/views/dropdown_bar_host.h"
+#include "chrome/browser/ui/views_mode_controller.h"
+#include "ui/base/ui_base_features.h"
 
 namespace chrome {
 
 void DisableFindBarAnimationsDuringTesting(bool disable) {
   DropdownBarHost::disable_animations_during_testing_ = disable;
+#if defined(OS_MACOSX) && BUILDFLAG(MAC_VIEWS_BROWSER)
+  if (views_mode_controller::IsViewsBrowserCocoa())
+    DisableFindBarCocoaAnimationsDuringTesting(disable);
+#endif
 }
 
 }  // namespace chrome