Restore some Cocoa browser test coverage (interactive_ui_tests).

These fell off the waterfall in r549698.

Re-Enable:
 - browser_action_button_interactive_uitest.mm

Keep Disabled (tests obsolete secondary UI):
 - translate_bubble_test_utils_views_cocoa.mm

Mostly Re-enable:
 - permission_bubble_cocoa_interactive_uitest.mm
   * PermissionBubbleInteractiveUITest.SwitchTabs regressed.

Bug: 845389
Change-Id: If4c9efe9541786f5cf114c6a2c22d7400d92d30b
Reviewed-on: https://chromium-review.googlesource.com/1068631Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Trent Apted <tapted@chromium.org>
Cr-Commit-Position: refs/heads/master@{#560836}

chrome/browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm

@@ -153,7 +153,9 @@ IN_PROC_BROWSER_TEST_P(PermissionBubbleInteractiveUITest, CmdWClosesWindow) {
 
 // Add a tab, ensure we can switch away and back using Cmd+Alt+Left/Right and
 // curly braces.
-IN_PROC_BROWSER_TEST_P(PermissionBubbleInteractiveUITest, SwitchTabs) {
+// Disabled. See https://crbug.com/845389 - this regressed somewhere between
+// r545258 and r559030, but it may be obsolete soon.
+IN_PROC_BROWSER_TEST_P(PermissionBubbleInteractiveUITest, DISABLED_SwitchTabs) {
   NSWindow* browser_window = browser()->window()->GetNativeWindow();
 
   EXPECT_EQ(0, browser()->tab_strip_model()->active_index());

chrome/test/BUILD.gn

@@ -4998,17 +4998,25 @@ if (!is_android) {
         "//chrome:chrome_framework",
       ]
 
-      # The browser window can be views or Cocoa on Mac. Test accordingly.
       if (mac_views_browser) {
         # Aura depended tests.
         sources -= [ "../browser/ui/views/bookmarks/bookmark_bar_view_test.cc" ]
-      } else {
-        sources += [
-          "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm",
-          "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm",
-          "../browser/ui/cocoa/translate/translate_bubble_test_utils_views_cocoa.mm",
-        ]
       }
+
+      # The browser window can be views or Cocoa on Mac, but this is chosen at
+      # runtime. This block captures tests that only run with a Cocoa browser.
+      sources += [
+        "../browser/ui/cocoa/extensions/browser_action_button_interactive_uitest.mm",
+
+        # Note permission_bubble_cocoa_interactive_uitest tests both Cocoa and
+        # toolkit-views secondary UI. It should not be deleted with the Cocoa
+        # bubble (but it can be deleted with the Cocoa browser window).
+        "../browser/ui/cocoa/permission_bubble/permission_bubble_cocoa_interactive_uitest.mm",
+
+        # The translate bubble tests only obsolete Cocoa UI and doesn't link.
+        # Ensure the corresponding file is deleted when removing the next line.
+        # "../browser/ui/cocoa/translate/translate_bubble_test_utils_views_cocoa.mm",
+      ]
     }
 
     if (use_x11) {