[tab_under] Add UI expectations to browser tests

This change also moves more tests from interactive_ui_tests to
browser_tests since they don't really need to be interactive_ui_tests.

Bug: 661629
Change-Id: I24b1c4badf848826adf6db4511ddfb1368eb60e0
Reviewed-on: https://chromium-review.googlesource.com/806686Reviewed-by: Avi Drissman <avi@chromium.org>
Commit-Queue: Charlie Harrison <csharrison@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521705}

chrome/browser/ui/blocked_content/tab_under_blocker_browsertest.cc

@@ -7,8 +7,10 @@
 
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
+#include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/test/scoped_feature_list.h"
+#include "build/build_config.h"
 #include "chrome/browser/ui/blocked_content/popup_opener_tab_helper.h"
 #include "chrome/browser/ui/blocked_content/tab_under_navigation_throttle.h"
 #include "chrome/browser/ui/browser.h"
@@ -26,6 +28,10 @@
 #include "ui/base/page_transition_types.h"
 #include "url/gurl.h"
 
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/blocked_content/framebust_block_tab_helper.h"
+#endif
+
 class TabUnderBlockerBrowserTest : public InProcessBrowserTest {
  public:
   TabUnderBlockerBrowserTest() {}
@@ -43,6 +49,18 @@ class TabUnderBlockerBrowserTest : public InProcessBrowserTest {
                               blocked_url.spec().c_str());
   }
 
+  bool IsUiShownForUrl(content::WebContents* web_contents, const GURL& url) {
+// TODO(csharrison): Implement android checking when crbug.com/611756 is
+// resolved.
+#if defined(OS_ANDROID)
+    return false;
+#else
+    return base::ContainsValue(
+        FramebustBlockTabHelper::FromWebContents(web_contents)->blocked_urls(),
+        url);
+#endif
+  }
+
  private:
   base::test::ScopedFeatureList scoped_feature_list_;
 
@@ -84,6 +102,7 @@ IN_PROC_BROWSER_TEST_F(TabUnderBlockerBrowserTest, SimpleTabUnder_IsBlocked) {
   // technique.
   EXPECT_TRUE(content::ExecuteScript(opener, "var a = 0;"));
   EXPECT_EQ(expected_error, console_observer.message());
+  EXPECT_TRUE(IsUiShownForUrl(opener, cross_origin_url));
 }
 
 IN_PROC_BROWSER_TEST_F(TabUnderBlockerBrowserTest,
@@ -121,4 +140,5 @@ IN_PROC_BROWSER_TEST_F(TabUnderBlockerBrowserTest,
   // Round trip to the renderer to ensure the message would have been sent.
   EXPECT_TRUE(content::ExecuteScript(opener, "var a = 0;"));
   EXPECT_TRUE(console_observer.message().empty());
+  EXPECT_FALSE(IsUiShownForUrl(opener, cross_origin_url));
 }

chrome/test/BUILD.gn

@@ -666,7 +666,10 @@ test("browser_tests") {
       "../browser/sessions/tab_restore_browsertest.cc",
       "../browser/site_details_browsertest.cc",
       "../browser/thumbnails/thumbnail_browsertest.cc",
+      "../browser/ui/blocked_content/popup_blocker_browsertest.cc",
+      "../browser/ui/blocked_content/popup_tracker_browsertest.cc",
       "../browser/ui/blocked_content/safe_browsing_triggered_popup_blocker_browsertest.cc",
+      "../browser/ui/blocked_content/tab_under_blocker_browsertest.cc",
 
       # If this list is used on Android in the future, these browser/speech/*
       # files will probably not be applicable.
@@ -4354,9 +4357,6 @@ if (is_android) {
       "../browser/renderer_host/site_per_process_text_input_browsertest.cc",
       "../browser/site_per_process_interactive_browsertest.cc",
       "../browser/ui/autofill/autofill_popup_controller_interactive_uitest.cc",
-      "../browser/ui/blocked_content/popup_blocker_browsertest.cc",
-      "../browser/ui/blocked_content/popup_tracker_browsertest.cc",
-      "../browser/ui/blocked_content/tab_under_blocker_browsertest.cc",
       "../browser/ui/browser_command_controller_interactive_browsertest.cc",
       "../browser/ui/browser_focus_uitest.cc",
       "../browser/ui/cocoa/apps/app_shim_menu_controller_mac_interactive_uitest.mm",