Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(649)

Side by Side Diff: chrome/browser/ui/login/login_handler_browsertest.cc

Issue 2783053003: Disable a few tests that started flaking after r460581. (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include <algorithm> 5 #include <algorithm>
6 #include <list> 6 #include <list>
7 #include <map> 7 #include <map>
8 8
9 #include "base/metrics/field_trial.h" 9 #include "base/metrics/field_trial.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 790 matching lines...) Expand 10 before | Expand all | Expand 10 after
801 } 801 }
802 } 802 }
803 803
804 // Should stay on the main frame's url once the prompt the iframe is closed. 804 // Should stay on the main frame's url once the prompt the iframe is closed.
805 EXPECT_EQ("www.a.com", contents->GetVisibleURL().host()); 805 EXPECT_EQ("www.a.com", contents->GetVisibleURL().host());
806 806
807 EXPECT_EQ(1, observer.auth_needed_count()); 807 EXPECT_EQ(1, observer.auth_needed_count());
808 } 808 }
809 809
810 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) { 810 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, SupplyRedundantAuths) {
811 if (content::IsBrowserSideNavigationEnabled())
812 return; // TODO(jam): investigate
811 ASSERT_TRUE(embedded_test_server()->Start()); 813 ASSERT_TRUE(embedded_test_server()->Start());
812 814
813 // Get NavigationController for tab 1. 815 // Get NavigationController for tab 1.
814 content::WebContents* contents_1 = 816 content::WebContents* contents_1 =
815 browser()->tab_strip_model()->GetActiveWebContents(); 817 browser()->tab_strip_model()->GetActiveWebContents();
816 NavigationController* controller_1 = &contents_1->GetController(); 818 NavigationController* controller_1 = &contents_1->GetController();
817 819
818 // Open a new tab. 820 // Open a new tab.
819 ui_test_utils::NavigateToURLWithDisposition( 821 ui_test_utils::NavigateToURLWithDisposition(
820 browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB, 822 browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 auth_supplied_waiter_1.Wait(); 858 auth_supplied_waiter_1.Wait();
857 auth_supplied_waiter_2.Wait(); 859 auth_supplied_waiter_2.Wait();
858 } 860 }
859 861
860 EXPECT_EQ(2, observer.auth_needed_count()); 862 EXPECT_EQ(2, observer.auth_needed_count());
861 EXPECT_EQ(2, observer.auth_supplied_count()); 863 EXPECT_EQ(2, observer.auth_supplied_count());
862 EXPECT_EQ(0, observer.auth_cancelled_count()); 864 EXPECT_EQ(0, observer.auth_cancelled_count());
863 } 865 }
864 866
865 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) { 867 IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, CancelRedundantAuths) {
868 if (content::IsBrowserSideNavigationEnabled())
869 return; // TODO(jam): investigate
866 ASSERT_TRUE(embedded_test_server()->Start()); 870 ASSERT_TRUE(embedded_test_server()->Start());
867 871
868 // Get NavigationController for tab 1. 872 // Get NavigationController for tab 1.
869 content::WebContents* contents_1 = 873 content::WebContents* contents_1 =
870 browser()->tab_strip_model()->GetActiveWebContents(); 874 browser()->tab_strip_model()->GetActiveWebContents();
871 NavigationController* controller_1 = &contents_1->GetController(); 875 NavigationController* controller_1 = &contents_1->GetController();
872 876
873 // Open a new tab. 877 // Open a new tab.
874 ui_test_utils::NavigateToURLWithDisposition( 878 ui_test_utils::NavigateToURLWithDisposition(
875 browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB, 879 browser(), GURL("about:blank"), WindowOpenDisposition::NEW_FOREGROUND_TAB,
(...skipping 553 matching lines...) Expand 10 before | Expand all | Expand 10 after
1429 // out. 1433 // out.
1430 EXPECT_TRUE( 1434 EXPECT_TRUE(
1431 WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame())); 1435 WaitForRenderFrameReady(contents->GetInterstitialPage()->GetMainFrame()));
1432 EXPECT_TRUE(contents->ShowingInterstitialPage()); 1436 EXPECT_TRUE(contents->ShowingInterstitialPage());
1433 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, contents->GetInterstitialPage() 1437 EXPECT_EQ(SSLBlockingPage::kTypeForTesting, contents->GetInterstitialPage()
1434 ->GetDelegateForTesting() 1438 ->GetDelegateForTesting()
1435 ->GetTypeForTesting()); 1439 ->GetTypeForTesting());
1436 } 1440 }
1437 1441
1438 } // namespace 1442 } // namespace
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/web_navigation/web_navigation_apitest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698