Enable LoginPromptBrowserTest.TestCancelAuth_OnForward

chrome/browser/ui/login/login_handler_browsertest.cc

 // Copyright (c) 2012 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 <algorithm>
 #include <list>
 #include <map>
 
 #include "base/metrics/field_trial.h"
 #include "base/strings/utf_string_conversions.h"
@@ skipping 85 matching lines @@
 const char kPrefetchAuthPage[] = "/login/prefetch.html";
 
 const char kMultiRealmTestPage[] = "/login/multi_realm.html";
 const int  kMultiRealmTestRealmCount = 2;
 
 const char kSingleRealmTestPage[] = "/login/single_realm.html";
 
 const char kAuthBasicPage[] = "/auth-basic";
 const char kAuthDigestPage[] = "/auth-digest";
 
+// It does not matter what pages are selected as no-auth, as long as they exist.
+// Navigating to non-existing pages caused flakes in the past
+// (http://crbug.com/636875).

[meacer, 2016/08/12 17:23:27]

Very tiny nit: https://crbug.com :)

[vabr (Chromium), 2016/08/12 19:40:08]

Done.

+const char kNoAuthPage1[] = "/simple.html";
+const char kNoAuthPage2[] = "/form.html";
+
 base::string16 ExpectedTitleFromAuth(const base::string16& username,
                                      const base::string16& password) {
   // The TestServer sets the title to username/password on successful login.
   return username + base::UTF8ToUTF16("/") + password;
 }
 
 // Confirm that <link rel="prefetch"> targetting an auth required
 // resource does not provide a login dialog.  These types of requests
 // should instead just cancel the auth.
 
@@ skipping 225 matching lines @@
     auth_cancelled_waiter.Wait();
     load_stop_waiter.Wait();
     EXPECT_TRUE(observer.handlers().empty());
   }
 }
 
 // Test login prompt cancellation on navigation to a new page.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth_OnNavigation) {
   ASSERT_TRUE(embedded_test_server()->Start());
   const GURL auth_page = embedded_test_server()->GetURL(kAuthBasicPage);
-  const GURL no_auth_page = embedded_test_server()->GetURL("/b");
+  const GURL no_auth_page = embedded_test_server()->GetURL(kNoAuthPage1);
 
   NavigationController* controller =
       &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<NavigationController>(controller));
 
   // Navigating while auth is requested is the same as cancelling.
   {
     // One LOAD_STOP event for auth_page and one for no_auth_page.
     const int kLoadStopEvents = 2;
     WindowedLoadStopObserver load_stop_waiter(controller, kLoadStopEvents);
     WindowedAuthNeededObserver auth_needed_waiter(controller);
     browser()->OpenURL(OpenURLParams(auth_page, Referrer(), CURRENT_TAB,
                                      ui::PAGE_TRANSITION_TYPED, false));
     auth_needed_waiter.Wait();
     WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
     browser()->OpenURL(OpenURLParams(no_auth_page, Referrer(), CURRENT_TAB,
                                      ui::PAGE_TRANSITION_TYPED, false));
     auth_cancelled_waiter.Wait();
     load_stop_waiter.Wait();
     EXPECT_TRUE(observer.handlers().empty());
   }
 }
 
 // Test login prompt cancellation on navigation to back.
 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth_OnBack) {
   ASSERT_TRUE(embedded_test_server()->Start());
   const GURL auth_page = embedded_test_server()->GetURL(kAuthBasicPage);
-  const GURL no_auth_page = embedded_test_server()->GetURL("/a");
+  const GURL no_auth_page = embedded_test_server()->GetURL(kNoAuthPage1);
 
   NavigationController* controller =
       &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<NavigationController>(controller));
 
   // First navigate to an unauthenticated page so we have something to
   // go back to.
   ui_test_utils::NavigateToURL(browser(), no_auth_page);
@@ skipping 10 matching lines @@
     WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
     ASSERT_TRUE(controller->CanGoBack());
     controller->GoBack();
     auth_cancelled_waiter.Wait();
     load_stop_waiter.Wait();
     EXPECT_TRUE(observer.handlers().empty());
   }
 }
 
 // Test login prompt cancellation on navigation to forward.
-// TODO(crbug.com/636875) Flaky on Mac and Linux at least.
-IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest,
-                       DISABLED_TestCancelAuth_OnForward) {
+IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, TestCancelAuth_OnForward) {
   ASSERT_TRUE(embedded_test_server()->Start());
   const GURL auth_page = embedded_test_server()->GetURL(kAuthBasicPage);
-  const GURL no_auth_page_1 = embedded_test_server()->GetURL("/a");
-  const GURL no_auth_page_2 = embedded_test_server()->GetURL("/c");
+  const GURL no_auth_page_1 = embedded_test_server()->GetURL(kNoAuthPage1);
+  const GURL no_auth_page_2 = embedded_test_server()->GetURL(kNoAuthPage2);
 
   NavigationController* controller =
       &browser()->tab_strip_model()->GetActiveWebContents()->GetController();
 
   LoginPromptBrowserTestObserver observer;
   observer.Register(content::Source<NavigationController>(controller));
 
   ui_test_utils::NavigateToURL(browser(), no_auth_page_1);
 
   // Now add a page and go back, so we have something to go forward to.
@@ skipping 1077 matching lines @@
   // out.
   EXPECT_TRUE(
       WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
   EXPECT_TRUE(contents->ShowingInterstitialPage());
   EXPECT_EQ(SSLBlockingPage::kTypeForTesting, contents->GetInterstitialPage()
                                                   ->GetDelegateForTesting()
                                                   ->GetTypeForTesting());
 }
 
 }  // namespace