| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/utf_string_conversions.h" | 9 #include "base/utf_string_conversions.h" |
| 10 #include "chrome/browser/prerender/prerender_manager.h" | 10 #include "chrome/browser/prerender/prerender_manager.h" |
| (...skipping 664 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 675 LoginPromptBrowserTestObserver observer; | 675 LoginPromptBrowserTestObserver observer; |
| 676 observer.Register(content::Source<NavigationController>(controller_1)); | 676 observer.Register(content::Source<NavigationController>(controller_1)); |
| 677 observer.Register(content::Source<NavigationController>(controller_2)); | 677 observer.Register(content::Source<NavigationController>(controller_2)); |
| 678 | 678 |
| 679 { | 679 { |
| 680 // Open different auth urls in each tab. | 680 // Open different auth urls in each tab. |
| 681 WindowedAuthNeededObserver auth_needed_waiter_1(controller_1); | 681 WindowedAuthNeededObserver auth_needed_waiter_1(controller_1); |
| 682 WindowedAuthNeededObserver auth_needed_waiter_2(controller_2); | 682 WindowedAuthNeededObserver auth_needed_waiter_2(controller_2); |
| 683 contents_1->tab_contents()->OpenURL(OpenURLParams( | 683 contents_1->tab_contents()->OpenURL(OpenURLParams( |
| 684 test_server()->GetURL("auth-basic/1"), | 684 test_server()->GetURL("auth-basic/1"), |
| 685 GURL(), | 685 content::Referrer(), |
| 686 CURRENT_TAB, | 686 CURRENT_TAB, |
| 687 content::PAGE_TRANSITION_TYPED, | 687 content::PAGE_TRANSITION_TYPED, |
| 688 false)); | 688 false)); |
| 689 contents_2->tab_contents()->OpenURL(OpenURLParams( | 689 contents_2->tab_contents()->OpenURL(OpenURLParams( |
| 690 test_server()->GetURL("auth-basic/2"), | 690 test_server()->GetURL("auth-basic/2"), |
| 691 GURL(), | 691 content::Referrer(), |
| 692 CURRENT_TAB, | 692 CURRENT_TAB, |
| 693 content::PAGE_TRANSITION_TYPED, | 693 content::PAGE_TRANSITION_TYPED, |
| 694 false)); | 694 false)); |
| 695 auth_needed_waiter_1.Wait(); | 695 auth_needed_waiter_1.Wait(); |
| 696 auth_needed_waiter_2.Wait(); | 696 auth_needed_waiter_2.Wait(); |
| 697 | 697 |
| 698 ASSERT_EQ(2U, observer.handlers_.size()); | 698 ASSERT_EQ(2U, observer.handlers_.size()); |
| 699 | 699 |
| 700 // Supply auth in one of the tabs. | 700 // Supply auth in one of the tabs. |
| 701 WindowedAuthSuppliedObserver auth_supplied_waiter_1(controller_1); | 701 WindowedAuthSuppliedObserver auth_supplied_waiter_1(controller_1); |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 741 LoginPromptBrowserTestObserver observer; | 741 LoginPromptBrowserTestObserver observer; |
| 742 observer.Register(content::Source<NavigationController>(controller_1)); | 742 observer.Register(content::Source<NavigationController>(controller_1)); |
| 743 observer.Register(content::Source<NavigationController>(controller_2)); | 743 observer.Register(content::Source<NavigationController>(controller_2)); |
| 744 | 744 |
| 745 { | 745 { |
| 746 // Open different auth urls in each tab. | 746 // Open different auth urls in each tab. |
| 747 WindowedAuthNeededObserver auth_needed_waiter_1(controller_1); | 747 WindowedAuthNeededObserver auth_needed_waiter_1(controller_1); |
| 748 WindowedAuthNeededObserver auth_needed_waiter_2(controller_2); | 748 WindowedAuthNeededObserver auth_needed_waiter_2(controller_2); |
| 749 contents_1->tab_contents()->OpenURL(OpenURLParams( | 749 contents_1->tab_contents()->OpenURL(OpenURLParams( |
| 750 test_server()->GetURL("auth-basic/1"), | 750 test_server()->GetURL("auth-basic/1"), |
| 751 GURL(), | 751 content::Referrer(), |
| 752 CURRENT_TAB, | 752 CURRENT_TAB, |
| 753 content::PAGE_TRANSITION_TYPED, | 753 content::PAGE_TRANSITION_TYPED, |
| 754 false)); | 754 false)); |
| 755 contents_2->tab_contents()->OpenURL(OpenURLParams( | 755 contents_2->tab_contents()->OpenURL(OpenURLParams( |
| 756 test_server()->GetURL("auth-basic/2"), | 756 test_server()->GetURL("auth-basic/2"), |
| 757 GURL(), | 757 content::Referrer(), |
| 758 CURRENT_TAB, | 758 CURRENT_TAB, |
| 759 content::PAGE_TRANSITION_TYPED, | 759 content::PAGE_TRANSITION_TYPED, |
| 760 false)); | 760 false)); |
| 761 auth_needed_waiter_1.Wait(); | 761 auth_needed_waiter_1.Wait(); |
| 762 auth_needed_waiter_2.Wait(); | 762 auth_needed_waiter_2.Wait(); |
| 763 | 763 |
| 764 ASSERT_EQ(2U, observer.handlers_.size()); | 764 ASSERT_EQ(2U, observer.handlers_.size()); |
| 765 | 765 |
| 766 // Cancel auth in one of the tabs. | 766 // Cancel auth in one of the tabs. |
| 767 WindowedAuthCancelledObserver auth_cancelled_waiter_1(controller_1); | 767 WindowedAuthCancelledObserver auth_cancelled_waiter_1(controller_1); |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 808 observer_incognito.Register( | 808 observer_incognito.Register( |
| 809 content::Source<NavigationController>(controller_incognito)); | 809 content::Source<NavigationController>(controller_incognito)); |
| 810 | 810 |
| 811 { | 811 { |
| 812 // Open an auth url in each window. | 812 // Open an auth url in each window. |
| 813 WindowedAuthNeededObserver auth_needed_waiter(controller); | 813 WindowedAuthNeededObserver auth_needed_waiter(controller); |
| 814 WindowedAuthNeededObserver auth_needed_waiter_incognito( | 814 WindowedAuthNeededObserver auth_needed_waiter_incognito( |
| 815 controller_incognito); | 815 controller_incognito); |
| 816 contents->tab_contents()->OpenURL(OpenURLParams( | 816 contents->tab_contents()->OpenURL(OpenURLParams( |
| 817 test_server()->GetURL("auth-basic/1"), | 817 test_server()->GetURL("auth-basic/1"), |
| 818 GURL(), | 818 content::Referrer(), |
| 819 CURRENT_TAB, | 819 CURRENT_TAB, |
| 820 content::PAGE_TRANSITION_TYPED, | 820 content::PAGE_TRANSITION_TYPED, |
| 821 false)); | 821 false)); |
| 822 contents_incognito->tab_contents()->OpenURL(OpenURLParams( | 822 contents_incognito->tab_contents()->OpenURL(OpenURLParams( |
| 823 test_server()->GetURL("auth-basic/2"), | 823 test_server()->GetURL("auth-basic/2"), |
| 824 GURL(), | 824 content::Referrer(), |
| 825 CURRENT_TAB, | 825 CURRENT_TAB, |
| 826 content::PAGE_TRANSITION_TYPED, | 826 content::PAGE_TRANSITION_TYPED, |
| 827 false)); | 827 false)); |
| 828 auth_needed_waiter.Wait(); | 828 auth_needed_waiter.Wait(); |
| 829 auth_needed_waiter_incognito.Wait(); | 829 auth_needed_waiter_incognito.Wait(); |
| 830 | 830 |
| 831 ASSERT_EQ(1U, observer.handlers_.size()); | 831 ASSERT_EQ(1U, observer.handlers_.size()); |
| 832 ASSERT_EQ(1U, observer_incognito.handlers_.size()); | 832 ASSERT_EQ(1U, observer_incognito.handlers_.size()); |
| 833 | 833 |
| 834 // Supply auth in regular tab. | 834 // Supply auth in regular tab. |
| (...skipping 15 matching lines...) Expand all Loading... |
| 850 EXPECT_EQ(1, observer.auth_needed_count_); | 850 EXPECT_EQ(1, observer.auth_needed_count_); |
| 851 EXPECT_EQ(1, observer.auth_supplied_count_); | 851 EXPECT_EQ(1, observer.auth_supplied_count_); |
| 852 EXPECT_EQ(0, observer.auth_cancelled_count_); | 852 EXPECT_EQ(0, observer.auth_cancelled_count_); |
| 853 EXPECT_EQ(1, observer_incognito.auth_needed_count_); | 853 EXPECT_EQ(1, observer_incognito.auth_needed_count_); |
| 854 EXPECT_EQ(0, observer_incognito.auth_supplied_count_); | 854 EXPECT_EQ(0, observer_incognito.auth_supplied_count_); |
| 855 EXPECT_EQ(0, observer_incognito.auth_cancelled_count_); | 855 EXPECT_EQ(0, observer_incognito.auth_cancelled_count_); |
| 856 EXPECT_TRUE(test_server()->Stop()); | 856 EXPECT_TRUE(test_server()->Stop()); |
| 857 } | 857 } |
| 858 | 858 |
| 859 } // namespace | 859 } // namespace |
| OLD | NEW |