Redo PasswordManagerBrowserTestBase.InternalsPage

chrome/browser/password_manager/password_manager_browsertest.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <string>
 #include <utility>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
@@ skipping 145 matching lines @@
   std::string fill_and_submit =
       "document.getElementById('username_failed').value = 'temp';"
       "document.getElementById('password_failed').value = 'random';"
       "document.getElementById('failed_form').submit()";
 
   ASSERT_TRUE(content::ExecuteScript(rvh, fill_and_submit));
   observer.Wait();
   EXPECT_FALSE(prompt_observer->IsShowingSavePrompt());
 }
 
+// Opens the internals page, then some page with a HTML form. Then it activates
+// back the internals page and waits until it contains the string segment |str|.
+// The check is done by a repeatedly called JavaScript function, which navigates
+// away from the internals page as soon as it finds |str|. Thus, the waiting for
+// |str| is reduced to waiting for a navigation. |browser| needs to represent
+// the current test Chrome window.
+void WaitForStringInInternals(const std::string& str,
+                              const GURL& form_page,
+                              Browser* browser) {
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser, GURL("chrome://password-manager-internals"), CURRENT_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+  int internals_index = browser->tab_strip_model()->active_index();
+
+  ui_test_utils::NavigateToURLWithDisposition(
+      browser, form_page, NEW_FOREGROUND_TAB,
+      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
+
+  browser->tab_strip_model()->ActivateTabAt(internals_index, true);
+
+  std::string find_renderer_logs =
+      "function logChecker() {"
+      "  var text = document.getElementById('log-entries').innerText;"
+      "  var logs_found = /" +
+      str +
+      "/.test(text);"
+      "  if (logs_found) {"
+      "    location = 'done.html';"
+      "  } else {"
+      "    window.setTimeout(logChecker, 500);"
+      "  }"
+      "}"
+      "window.setTimeout(logChecker, 0);";
+  NavigationObserver observer(
+      browser->tab_strip_model()->GetActiveWebContents());
+  ASSERT_TRUE(content::ExecuteScript(
+      browser->tab_strip_model()->GetActiveWebContents()->GetRenderViewHost(),
+      find_renderer_logs));
+  observer.Wait();
+}
+
 }  // namespace
 
 namespace password_manager {
 
 // Actual tests ---------------------------------------------------------------
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, PromptForNormalSubmit) {
   NavigateToFile("/password/password_form.html");
 
   // Fill a form and submit through a <input type="submit"> button. Nothing
   // special.
@@ skipping 2559 matching lines @@
 
   std::string get_password =
       "window.domAutomationController.send("
       "  document.getElementById('hidden_password_form').elements[2].value);";
   std::string actual_password;
   ASSERT_TRUE(content::ExecuteScriptAndExtractString(
       RenderViewHost(), get_password, &actual_password));
   EXPECT_EQ("mypassword", actual_password);
 }
 
-// Check that the internals page contains logs both from the renderer and the
-// browser.
-// TODO(crbug.com/640737) Flaky on Mac.
-#if defined(OS_MACOSX)
-#define MAYBE_InternalsPage DISABLED_InternalsPage
-#else
-#define MAYBE_InternalsPage InternalsPage
-#endif
-IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, MAYBE_InternalsPage) {
-  ui_test_utils::NavigateToURLWithDisposition(
-      browser(), GURL("chrome://password-manager-internals"), CURRENT_TAB,
-      ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-  content::WebContents* internals_web_contents = WebContents();
+// Check that the internals page contains logs from the renderer.
+IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, InternalsPage_Renderer) {
+  WaitForStringInInternals(
+      "PasswordAutofillAgent::",
+      embedded_test_server()->GetURL("/password/password_form.html"),
+      browser());
+}
 
-  ui_test_utils::NavigateToURLWithDisposition(
-      browser(), embedded_test_server()->GetURL("/password/password_form.html"),
-      NEW_FOREGROUND_TAB, ui_test_utils::BROWSER_TEST_WAIT_FOR_NAVIGATION);
-
-  std::string find_renderer_logs =
-      "var text = document.getElementById('log-entries').innerText;"
-      "var logs_found = /PasswordAutofillAgent::/.test(text);"
-      "window.domAutomationController.send(logs_found);";
-  bool renderer_logs_found;
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      internals_web_contents->GetRenderViewHost(), find_renderer_logs,
-      &renderer_logs_found));
-  EXPECT_TRUE(renderer_logs_found);
-
-  std::string find_browser_logs =
-      "var text = document.getElementById('log-entries').innerText;"
-      "var logs_found = /PasswordManager::/.test(text);"
-      "window.domAutomationController.send(logs_found);";
-  bool browser_logs_found;
-  ASSERT_TRUE(content::ExecuteScriptAndExtractBool(
-      internals_web_contents->GetRenderViewHost(), find_browser_logs,
-      &browser_logs_found));
-  EXPECT_TRUE(browser_logs_found);
+// Check that the internals page contains logs both from the browser.

[vasilii, 2016/08/29 13:56:07]

logs from the browser.

[vabr (Chromium), 2016/08/29 15:40:36]

Done.

+IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase, InternalsPage_Browser) {
+  WaitForStringInInternals(
+      "PasswordManager::",
+      embedded_test_server()->GetURL("/password/password_form.html"),
+      browser());
 }
 
 // Tests that submitted credentials are saved on a password form without
 // username element when there are no stored credentials.
 IN_PROC_BROWSER_TEST_F(PasswordManagerBrowserTestBase,
                        PasswordRetryFormSaveNoUsernameCredentials) {
   scoped_refptr<password_manager::TestPasswordStore> password_store =
       static_cast<password_manager::TestPasswordStore*>(
           PasswordStoreFactory::GetForProfile(
               browser()->profile(), ServiceAccessType::IMPLICIT_ACCESS)
@@ skipping 260 matching lines @@
   // about all frames, not just the main one. The factories should receive
   // messages for non-main frames, in particular
   // AutofillHostMsg_PasswordFormsParsed. If that were the first time the
   // factories hear about such frames, this would crash.
   tab_strip_model->AddWebContents(detached_web_contents.release(), -1,
                                   ::ui::PAGE_TRANSITION_AUTO_TOPLEVEL,
                                   TabStripModel::ADD_ACTIVE);
 }
 
 }  // namespace password_manager