Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(178)

Side by Side Diff: chrome/browser/ui/libgtkui/select_file_dialog_interactive_uitest.cc

Issue 2740333002: Disable flaky BrowserSelectFileDialogTest.ModalTest on Linux (Closed)
Patch Set: Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/macros.h" 5 #include "base/macros.h"
6 #include "chrome/browser/ui/browser.h" 6 #include "chrome/browser/ui/browser.h"
7 #include "chrome/browser/ui/browser_window.h" 7 #include "chrome/browser/ui/browser_window.h"
8 #include "chrome/browser/ui/chrome_select_file_policy.h" 8 #include "chrome/browser/ui/chrome_select_file_policy.h"
9 #include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h" 9 #include "chrome/browser/ui/libgtkui/select_file_dialog_impl_gtk.h"
10 #include "chrome/browser/ui/view_ids.h" 10 #include "chrome/browser/ui/view_ids.h"
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
61 private: 61 private:
62 // Dialog box used for opening and saving files. 62 // Dialog box used for opening and saving files.
63 scoped_refptr<ui::SelectFileDialog> select_file_dialog_; 63 scoped_refptr<ui::SelectFileDialog> select_file_dialog_;
64 64
65 DISALLOW_COPY_AND_ASSIGN(FilePicker); 65 DISALLOW_COPY_AND_ASSIGN(FilePicker);
66 }; 66 };
67 67
68 } // namespace libgtkui 68 } // namespace libgtkui
69 69
70 // Leaks in GtkFileChooserDialog. http://crbug.com/537468 70 // Leaks in GtkFileChooserDialog. http://crbug.com/537468
71 #if defined(ADDRESS_SANITIZER) 71 // Flaky on Linux. http://crbug.com/700134
72 #if defined(ADDRESS_SANITIZER) || defined(OS_LINUX)
72 #define MAYBE_ModalTest DISABLED_ModalTest 73 #define MAYBE_ModalTest DISABLED_ModalTest
73 #else 74 #else
74 #define MAYBE_ModalTest ModalTest 75 #define MAYBE_ModalTest ModalTest
75 #endif 76 #endif
76 // Test that the file-picker is modal. 77 // Test that the file-picker is modal.
77 IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, MAYBE_ModalTest) { 78 IN_PROC_BROWSER_TEST_F(BrowserSelectFileDialogTest, MAYBE_ModalTest) {
78 // Bring the native window to the foreground. Returns true on success. 79 // Bring the native window to the foreground. Returns true on success.
79 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser())); 80 ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
80 ASSERT_TRUE(browser()->window()->IsActive()); 81 ASSERT_TRUE(browser()->window()->IsActive());
81 82
(...skipping 25 matching lines...) Expand all
107 108
108 file_picker.Close(); 109 file_picker.Close();
109 110
110 // Run a nested loop until the browser window becomes active. 111 // Run a nested loop until the browser window becomes active.
111 views::test::WidgetActivationWaiter wait_active(widget, true); 112 views::test::WidgetActivationWaiter wait_active(widget, true);
112 wait_active.Wait(); 113 wait_active.Wait();
113 114
114 ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER); 115 ui_test_utils::ClickOnView(browser(), VIEW_ID_TAB_CONTAINER);
115 EXPECT_TRUE(browser()->window()->IsActive()); 116 EXPECT_TRUE(browser()->window()->IsActive());
116 } 117 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698