Index: chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc |
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc |
index 7fc42ce14ad9d9908c69ad4093faaef08a9ac28c..d23e4155e734d553e0466ec7b26a7fe4a849c756 100644 |
--- a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc |
+++ b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc |
@@ -7,6 +7,7 @@ |
#include <stddef.h> |
#include "base/macros.h" |
+#include "base/run_loop.h" |
#include "base/strings/utf_string_conversions.h" |
#include "build/build_config.h" |
#include "chrome/app/chrome_command_ids.h" |
@@ -45,6 +46,7 @@ void ToolbarViewTest::RunToolbarCycleFocusTest(Browser* browser) { |
// Send focus to the toolbar as if the user pressed Alt+Shift+T. |
updater->ExecuteCommand(IDC_FOCUS_TOOLBAR); |
+ base::RunLoop().RunUntilIdle(); |
views::View* first_view = focus_manager->GetFocusedView(); |
std::vector<int> ids; |
@@ -100,15 +102,7 @@ IN_PROC_BROWSER_TEST_F(ToolbarViewTest, DISABLED_ToolbarCycleFocus) { |
RunToolbarCycleFocusTest(browser()); |
} |
-#if defined(OS_WIN) |
-// http://crbug.com/152938 Flaky on win. |
-#define MAYBE_ToolbarCycleFocusWithBookmarkBar \ |
- DISABLED_ToolbarCycleFocusWithBookmarkBar |
-#else |
-#define MAYBE_ToolbarCycleFocusWithBookmarkBar ToolbarCycleFocusWithBookmarkBar |
-#endif |
-IN_PROC_BROWSER_TEST_F(ToolbarViewTest, |
- MAYBE_ToolbarCycleFocusWithBookmarkBar) { |
+IN_PROC_BROWSER_TEST_F(ToolbarViewTest, ToolbarCycleFocusWithBookmarkBar) { |
sky
2016/10/10 22:47:21
It seems as though this test relies on focus. If t
|
CommandUpdater* updater = browser()->command_controller()->command_updater(); |
updater->ExecuteCommand(IDC_SHOW_BOOKMARK_BAR); |