Fix ContentSettingBubbleContentsBrowserTest to work on Chrome OS.

Add plumbing to check if a content setting bubble is showing.
Use that to test for bubble presence, not GetAllWidgets.
See http://crrev.com/c/922268 for GetAllWidgets changes.

Bug: 811940
Change-Id: I5b8e36c5dcddb8dfd407ad0f889ad74fb9804273
Reviewed-on: https://chromium-review.googlesource.com/919922Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537212}

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.h

@@ -37,6 +37,9 @@ class ContentSettingDecoration : public ImageDecoration {
   // Returns true if the decoration's visible state changed.
   bool UpdateFromWebContents(content::WebContents* web_contents);
 
+  // Returns if the content setting bubble is showing for this decoration.
+  bool IsShowingBubble() const;
+
   // Overridden from |LocationBarDecoration|
   AcceptsPress AcceptsMousePress() override;
   bool OnMousePressed(NSRect frame, NSPoint location) override;

chrome/browser/ui/cocoa/location_bar/content_setting_decoration.mm

@@ -228,6 +228,10 @@ bool ContentSettingDecoration::UpdateFromWebContents(
   return decoration_changed;
 }
 
+bool ContentSettingDecoration::IsShowingBubble() const {
+  return bubbleWindow_ && [bubbleWindow_ isVisible];
+}
+
 CGFloat ContentSettingDecoration::MeasureTextWidth() {
   return [animated_text_ size].width;
 }

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h

@@ -88,6 +88,7 @@ class LocationBarViewMac : public LocationBar,
   // Overridden from LocationBarTesting:
   bool GetBookmarkStarVisibility() override;
   bool TestContentSettingImagePressed(size_t index) override;
+  bool IsContentSettingBubbleShowing(size_t index) override;
 
   // Set/Get the editable state of the field.
   void SetEditable(bool editable);

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

@@ -266,6 +266,11 @@ bool LocationBarViewMac::TestContentSettingImagePressed(size_t index) {
   return true;
 }
 
+bool LocationBarViewMac::IsContentSettingBubbleShowing(size_t index) {
+  return index < content_setting_decorations_.size() &&
+         content_setting_decorations_[index]->IsShowingBubble();
+}
+
 void LocationBarViewMac::SetEditable(bool editable) {
   [field_ setEditable:editable ? YES : NO];
   UpdateBookmarkStarVisibility();

chrome/browser/ui/location_bar/location_bar.h

@@ -105,6 +105,9 @@ class LocationBarTesting {
   // Returns false if there is none.
   virtual bool TestContentSettingImagePressed(size_t index) = 0;
 
+  // Returns if the content setting image at |index| is displaying a bubble.
+  virtual bool IsContentSettingBubbleShowing(size_t index) = 0;
+
  protected:
   virtual ~LocationBarTesting() {}
 };

chrome/browser/ui/views/content_setting_bubble_contents_browsertest.cc

@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/views/content_setting_bubble_contents.h"
 
-#include <algorithm>
-
 #include "base/run_loop.h"
 #include "build/build_config.h"
 #include "chrome/browser/permissions/permission_request_manager_test_api.h"
@@ -16,13 +14,13 @@
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "content/public/test/browser_test_utils.h"
-#include "ui/views/test/widget_test.h"
-#include "ui/views/widget/widget.h"
 
 class ContentSettingBubbleContentsBrowserTest : public InProcessBrowserTest {
- protected:
-  using Widgets = views::Widget::Widgets;
+ public:
+  ContentSettingBubbleContentsBrowserTest() = default;
+  ~ContentSettingBubbleContentsBrowserTest() override {}
 
+ protected:
   GURL GetTestPageUrl(const std::string& name) {
     return ui_test_utils::GetTestUrl(
         base::FilePath().AppendASCII("content_setting_bubble"),
@@ -37,26 +35,13 @@ class ContentSettingBubbleContentsBrowserTest : public InProcessBrowserTest {
     return content::ExecuteScript(GetWebContents(), script);
   }
 
-  Widgets GetWidgetsNotIn(Widgets widgets) {
-    Widgets new_widgets = views::test::WidgetTest::GetAllWidgets();
-    Widgets result;
-    std::set_difference(new_widgets.begin(), new_widgets.end(), widgets.begin(),
-                        widgets.end(), std::inserter(result, result.begin()));
-    return result;
-  }
+ private:
+  DISALLOW_COPY_AND_ASSIGN(ContentSettingBubbleContentsBrowserTest);
 };
 
-#if defined(OS_CHROMEOS)
-// https://crbug.com/811940
-#define MAYBE_HidesAtWebContentsClose DISABLED_HidesAtWebContentsClose
-#else
-#define MAYBE_HidesAtWebContentsClose HidesAtWebContentsClose
-#endif
-
 IN_PROC_BROWSER_TEST_F(ContentSettingBubbleContentsBrowserTest,
-                       MAYBE_HidesAtWebContentsClose) {
-  // Create a second tab, so that closing the test tab doesn't close the entire
-  // browser.
+                       HidesAtWebContentsClose) {
+  // Create a second tab, so closing the test tab doesn't close the browser.
   chrome::NewTab(browser());
 
   // Navigate to the test page, and have it request and be denied geolocation
@@ -66,19 +51,18 @@ IN_PROC_BROWSER_TEST_F(ContentSettingBubbleContentsBrowserTest,
       ->set_auto_response_for_test(PermissionRequestManager::DISMISS);
   ExecuteScript("geolocate();");
 
-  // Press the geolocation icon in the location bar, and make sure a new widget
-  // (the content setting bubble) appears.
+  // Press the geolocation icon and make sure its content setting bubble shows.
   LocationBarTesting* bar =
       browser()->window()->GetLocationBar()->GetLocationBarForTesting();
-  Widgets before = GetWidgetsNotIn({});
   EXPECT_TRUE(bar->TestContentSettingImagePressed(
       static_cast<size_t>(ContentSettingImageModel::ImageType::GEOLOCATION)));
-  EXPECT_EQ(1u, GetWidgetsNotIn(before).size());
+  EXPECT_TRUE(bar->IsContentSettingBubbleShowing(
+      static_cast<size_t>(ContentSettingImageModel::ImageType::GEOLOCATION)));
 
-  // Now close the tab, and make sure the content setting bubble's widget is
-  // gone. Note that window closure in Aura is asynchronous, so it's necessary
-  // to spin the runloop here.
+  // Close the tab, and make sure the bubble is gone. Note that window closure
+  // in Aura is asynchronous, so it's necessary to spin the run loop here.
   chrome::CloseTab(browser());
   base::RunLoop().RunUntilIdle();
-  EXPECT_EQ(0u, GetWidgetsNotIn(before).size());
+  EXPECT_FALSE(bar->IsContentSettingBubbleShowing(
+      static_cast<size_t>(ContentSettingImageModel::ImageType::GEOLOCATION)));
 }

chrome/browser/ui/views/location_bar/content_setting_image_view.h

@@ -66,11 +66,6 @@ class ContentSettingImageView : public IconLabelBubbleView {
 
   void disable_animation() { can_animate_ = false; }
 
- private:
-  // The total animation time, including open and close as well as an
-  // intervening "stay open" period.
-  static const int kAnimationDurationMS;
-
   // IconLabelBubbleView:
   const char* GetClassName() const override;
   void OnBoundsChanged(const gfx::Rect& previous_bounds) override;
@@ -85,6 +80,11 @@ class ContentSettingImageView : public IconLabelBubbleView {
   bool ShowBubble(const ui::Event& event) override;
   bool IsBubbleShowing() const override;
 
+ private:
+  // The total animation time, including open and close as well as an
+  // intervening "stay open" period.
+  static const int kAnimationDurationMS;
+
   // gfx::AnimationDelegate:
   void AnimationEnded(const gfx::Animation* animation) override;
   void AnimationProgressed(const gfx::Animation* animation) override;

chrome/browser/ui/views/location_bar/location_bar_view.cc

@@ -1019,6 +1019,11 @@ bool LocationBarView::TestContentSettingImagePressed(size_t index) {
   return true;
 }
 
+bool LocationBarView::IsContentSettingBubbleShowing(size_t index) {
+  return index < content_setting_views_.size() &&
+         content_setting_views_[index]->IsBubbleShowing();
+}
+
 ////////////////////////////////////////////////////////////////////////////////
 // LocationBarView, private views::View implementation:
 

chrome/browser/ui/views/location_bar/location_bar_view.h

@@ -331,6 +331,7 @@ class LocationBarView : public LocationBar,
   // LocationBarTesting:
   bool GetBookmarkStarVisibility() override;
   bool TestContentSettingImagePressed(size_t index) override;
+  bool IsContentSettingBubbleShowing(size_t index) override;
 
   // views::View:
   const char* GetClassName() const override;