Index: chrome/browser/ui/views/frame/browser_view_focus_uitest.cc |
diff --git a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc |
index 3d0aaf888fd2ff89b2c129f0fc9f9053fbfa294b..6abe19d87c0f7b6d9504c007f2d68d9c0417eaaf 100644 |
--- a/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc |
+++ b/chrome/browser/ui/views/frame/browser_view_focus_uitest.cc |
@@ -4,6 +4,7 @@ |
#include "chrome/browser/ui/views/frame/browser_view.h" |
+#include "base/run_loop.h" |
#include "build/build_config.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/browser_commands.h" |
@@ -14,8 +15,11 @@ |
#include "chrome/test/base/interactive_test_utils.h" |
#include "chrome/test/base/ui_test_utils.h" |
#include "net/test/embedded_test_server/embedded_test_server.h" |
+#include "ui/shell_dialogs/select_file_dialog.h" |
#include "ui/views/focus/focus_manager.h" |
#include "ui/views/view.h" |
+#include "ui/views/widget/widget.h" |
+#include "ui/views/widget/widget_observer.h" |
#include "url/gurl.h" |
const char kSimplePage[] = "/focus/page_with_focus.html"; |
@@ -27,6 +31,38 @@ class BrowserViewFocusTest : public InProcessBrowserTest { |
} |
}; |
+// Spins a run loop until a Widget's activation reaches the desired state. |
+class WidgetActivationWaiter : public views::WidgetObserver { |
+ public: |
+ explicit WidgetActivationWaiter(views::Widget* widget, bool active) |
+ : observed_(false), active_(active) { |
+ widget->AddObserver(this); |
+ EXPECT_NE(active, widget->IsActive()); |
+ } |
+ |
+ void Wait() { |
+ if (!observed_) |
+ run_loop_.Run(); |
+ } |
+ |
+ void OnWidgetActivationChanged(views::Widget* widget, bool active) override { |
+ if (active_ != active) |
+ return; |
+ |
+ observed_ = true; |
+ widget->RemoveObserver(this); |
+ if (run_loop_.running()) |
+ run_loop_.Quit(); |
+ } |
+ |
+ private: |
+ base::RunLoop run_loop_; |
+ bool observed_; |
+ bool active_; |
+ |
+ DISALLOW_COPY_AND_ASSIGN(WidgetActivationWaiter); |
+}; |
+ |
// Flaky, http://crbug.com/69034. |
IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, DISABLED_BrowsersRememberFocus) { |
ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
@@ -93,3 +129,37 @@ IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, DISABLED_BrowsersRememberFocus) { |
browser_view2->Close(); |
#endif |
} |
+ |
+// There are memory leaks in GtkFileChooserDialog, which was |
+// added to build/sanitizers/lsan_suppressions.cc as an encompassing entry. |
+// http://crbug.com/537468. |
+#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
+#define MAYBE_BrowserFileDialogTest BrowserFileDialogTest |
+#else |
+#define MAYBE_BrowserFileDialogTest DISABLED_BrowserFileDialogTest |
+#endif |
+IN_PROC_BROWSER_TEST_F(BrowserViewFocusTest, MAYBE_BrowserFileDialogTest) { |
+ ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); |
+ ASSERT_TRUE(embedded_test_server()->InitializeAndWaitUntilReady()); |
+ |
+ const GURL url = embedded_test_server()->GetURL(kSimplePage); |
+ ui_test_utils::NavigateToURL(browser(), url); |
+ ASSERT_TRUE(browser()->window()->IsActive()); |
+ |
+ ui::SelectFileDialog* file_dialog = browser()->OpenFile(); |
+ |
+ gfx::NativeWindow window = browser()->window()->GetNativeWindow(); |
+ views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window); |
+ ASSERT_NE(nullptr, widget); |
+ |
+ // Run a nested loop until the browser window becomes inactive. |
+ WidgetActivationWaiter wait_inactive(widget, false); |
+ wait_inactive.Wait(); |
+ EXPECT_FALSE(browser()->window()->IsActive()); |
+ file_dialog->Close(); |
+ |
+ // Run a nested loop until the browser window becomes active. |
+ WidgetActivationWaiter wait_active(widget, true); |
+ wait_active.Wait(); |
+ EXPECT_TRUE(browser()->window()->IsActive()); |
+} |