Fix flaky password visibility browser test

chrome/browser/ssl/security_state_tab_helper_browser_tests.cc

Index: chrome/browser/ssl/security_state_tab_helper_browser_tests.cc
diff --git a/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc b/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc
index 39f0dcd748e7afced93928107c1108b9be279e5e..e3474a4bb651dacb1b83102ae496e9de9988ae79 100644
--- a/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc
+++ b/chrome/browser/ssl/security_state_tab_helper_browser_tests.cc
@@ -68,10 +68,10 @@ const base::FilePath::CharType kDocRoot[] =
 // fields. Notifications about visible password fields are queued at the
 // end of the event loop, so waiting for a dummy script to run ensures
 // that these notifcations have been sent.
-void InjectScript(content::WebContents* contents) {
+void InjectScript(const content::ToRenderFrameHost& adapter) {
   bool js_result = false;
   EXPECT_TRUE(content::ExecuteScriptAndExtractBool(
-      contents, "window.domAutomationController.send(true);", &js_result));
+      adapter, "window.domAutomationController.send(true);", &js_result));
   EXPECT_TRUE(js_result);
 }
 
@@ -1137,7 +1137,11 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTestWithPasswordCcSwitch,
       browser(),
       GetURLWithNonLocalHostname(embedded_test_server(),
                                  "/password/simple_password_in_iframe.html"));
-  InjectScript(contents);
+  // Inject a dummy script into each frame to ensure that password notifications

[estark, 2017/02/10 00:55:34]

note: this test was not marked as flaky. I'm guessing this is because it's an
OOPIF iframe, so we don't technically need to inject into all the frames, but I
figured it was better for consistency.

[meacer, 2017/02/10 01:07:40]

Would it make sense to move this code to InjectScript and make it take a
WebContents so that it injects into all frames automatically? 

[estark, 2017/02/10 01:45:13]

Done.

+  // from any subframe have been sent.
+  for (const auto& frame : contents->GetAllFrames()) {
+    InjectScript(content::ToRenderFrameHost(frame));
+  }
   security_state::SecurityInfo security_info;
   helper->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::HTTP_SHOW_WARNING, security_info.security_level);
@@ -1152,16 +1156,8 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTestWithPasswordCcSwitch,
 // on an HTTP page load, and when the command-line flag is set, the
 // security level is downgraded to HTTP_SHOW_WARNING, even if the iframe
 // itself was loaded over HTTPS.
-#if defined(OS_LINUX)
-// Flaky on Linux. See https://crbug.com/662485.
-#define MAYBE_PasswordSecurityLevelDowngradedFromHttpsIframe \
-  DISABLED_PasswordSecurityLevelDowngradedFromHttpsIframe
-#else
-#define MAYBE_PasswordSecurityLevelDowngradedFromHttpsIframe \
-  PasswordSecurityLevelDowngradedFromHttpsIframe
-#endif
 IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTestWithPasswordCcSwitch,
-                       MAYBE_PasswordSecurityLevelDowngradedFromHttpsIframe) {
+                       PasswordSecurityLevelDowngradedFromHttpsIframe) {
   content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
   ASSERT_TRUE(contents);
@@ -1179,7 +1175,11 @@ IN_PROC_BROWSER_TEST_F(SecurityStateTabHelperTestWithPasswordCcSwitch,
   ui_test_utils::NavigateToURL(
       browser(),
       GetURLWithNonLocalHostname(embedded_test_server(), replacement_path));
-  InjectScript(contents);
+  // Inject a dummy script into each frame to ensure that password notifications
+  // from any subframe have been sent.

[meacer, 2017/02/10 01:07:40]

nit: any subframe or all subframes? They sound different to me.

[estark, 2017/02/10 01:45:13]

Probably should have been "all subframes", but n/a now

+  for (const auto& frame : contents->GetAllFrames()) {
+    InjectScript(content::ToRenderFrameHost(frame));
+  }
   security_state::SecurityInfo security_info;
   helper->GetSecurityInfo(&security_info);
   EXPECT_EQ(security_state::HTTP_SHOW_WARNING, security_info.security_level);