Update features::IsViewsBrowserCocoa() to respect kExperimentalUi.

When we added kExperimentalUi, I added it to
views_mode_controller::IsViewsBrowserCocoa() but I didn't notice
that there was this other implementation.

The omnibox has a feature that uses features::IsViewsBrowserCocoa() and
I'd like it to trigger on kExperimentalUi. Let me know if there's some
reason why we'd expect these to give different answers. There are only a
handful of places that depend on the features:: version:

https://cs.chromium.org/search/?q=features::IsViewsBrowserCocoa

Bug: 862336
Change-Id: Ieffe5d13bb08c5c36994cef9ccc850ca4552c2b2
Reviewed-on: https://chromium-review.googlesource.com/1132430Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Commit-Queue: Justin Donnelly <jdonnelly@chromium.org>
Cr-Commit-Position: refs/heads/master@{#574162}

chrome/browser/ui/views_mode_controller.cc

@@ -12,8 +12,7 @@
 namespace views_mode_controller {
 
 bool IsViewsBrowserCocoa() {
-  return features::IsViewsBrowserCocoa() &&
-         !base::FeatureList::IsEnabled(features::kExperimentalUi);
+  return features::IsViewsBrowserCocoa();
 }
 
 }  // namespace views_mode_controller

ui/base/ui_base_features.cc

@@ -162,7 +162,8 @@ const base::Feature kViewsBrowserWindows{"ViewsBrowserWindows",
 // Returns whether a Views-capable browser build should use the Cocoa browser
 // UI.
 bool IsViewsBrowserCocoa() {
-  return !base::FeatureList::IsEnabled(kViewsBrowserWindows);
+  return !base::FeatureList::IsEnabled(kViewsBrowserWindows) &&
+      !base::FeatureList::IsEnabled(kExperimentalUi);
 }
 #endif  //  BUILDFLAG(MAC_VIEWS_BROWSER)
 #endif  //  defined(OS_MACOSX)