Do not give instant focus if a view's toplevelwidget is not active

chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc

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..f0be66c459a38fdd4a856780c94969f382e2b3d9 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc
@@ -7,12 +7,14 @@
 #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"
 #include "chrome/browser/bookmarks/bookmark_model_factory.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_command_controller.h"
+#include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/frame/browser_view.h"
@@ -100,15 +102,8 @@ 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) {
+                       ToolbarCycleFocusWithBookmarkBar) {
   CommandUpdater* updater = browser()->command_controller()->command_updater();
   updater->ExecuteCommand(IDC_SHOW_BOOKMARK_BAR);
 
@@ -121,6 +116,8 @@ IN_PROC_BROWSER_TEST_F(ToolbarViewTest,
   // already showing when a window opens, so create a second browser
   // window with the same profile.
   Browser* second_browser = CreateBrowser(browser()->profile());
+  BrowserList::SetLastActive(second_browser);
+  base::RunLoop().RunUntilIdle();
   RunToolbarCycleFocusTest(second_browser);
 }