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

Unified Diff: chrome/browser/ui/login/login_handler_browsertest.cc

Issue 2828163004: Revert of Revert "Revert of Reland: Switch WindowedNotificationObserver to use base::RunLoop. (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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/login/login_handler_browsertest.cc
diff --git a/chrome/browser/ui/login/login_handler_browsertest.cc b/chrome/browser/ui/login/login_handler_browsertest.cc
index 9274f5f8a9641d54ac0c5bcb0e8304bc4547aed0..aea1ff04ec2a016eb2e0905436a0b6057c07901c 100644
--- a/chrome/browser/ui/login/login_handler_browsertest.cc
+++ b/chrome/browser/ui/login/login_handler_browsertest.cc
@@ -99,7 +99,6 @@
const char kMultiRealmTestPage[] = "/login/multi_realm.html";
const int kMultiRealmTestRealmCount = 2;
-const int kMultiRealmTestAuthRequestsCount = 4;
const char kSingleRealmTestPage[] = "/login/single_realm.html";
@@ -463,102 +462,104 @@
// Test handling of resources that require authentication even though
// the page they are included on doesn't. In this case we should only
// present the minimal number of prompts necessary for successfully
-// displaying the page.
-class MultiRealmLoginPromptBrowserTest : public LoginPromptBrowserTest {
- public:
- void TearDownOnMainThread() override {
- login_prompt_observer_.UnregisterAll();
- LoginPromptBrowserTest::TearDownOnMainThread();
- }
-
- // Load the multi-realm test page, waits for LoginHandlers to be created, then
- // calls |for_each_realm_func| once for each authentication realm, passing a
- // LoginHandler for the realm as an argument. The page should stop loading
- // after that.
- template <class F>
- void RunTest(const F& for_each_realm_func);
-
- NavigationController* GetNavigationController() {
- return &browser()
- ->tab_strip_model()
- ->GetActiveWebContents()
- ->GetController();
- }
-
- LoginPromptBrowserTestObserver* login_prompt_observer() {
- return &login_prompt_observer_;
- }
-
- private:
- LoginPromptBrowserTestObserver login_prompt_observer_;
-};
-
-template <class F>
-void MultiRealmLoginPromptBrowserTest::RunTest(const F& for_each_realm_func) {
+// displaying the page. First we check whether cancelling works as
+// expected.
+IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmCancellation) {
ASSERT_TRUE(embedded_test_server()->Start());
GURL test_page = embedded_test_server()->GetURL(kMultiRealmTestPage);
- NavigationController* controller = GetNavigationController();
-
- login_prompt_observer_.Register(
- content::Source<NavigationController>(controller));
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ NavigationController* controller = &contents->GetController();
+ LoginPromptBrowserTestObserver observer;
+
+ observer.Register(content::Source<NavigationController>(controller));
WindowedLoadStopObserver load_stop_waiter(controller, 1);
- browser()->OpenURL(OpenURLParams(test_page, Referrer(),
- WindowOpenDisposition::CURRENT_TAB,
- ui::PAGE_TRANSITION_TYPED, false));
-
- // Need to have LoginHandlers created for all requests that need
- // authentication.
- while (login_prompt_observer_.handlers().size() <
- kMultiRealmTestAuthRequestsCount)
- WindowedAuthNeededObserver(controller).Wait();
-
- // Now confirm or cancel auth once per realm.
- std::set<std::string> seen_realms;
- for (int i = 0; i < kMultiRealmTestRealmCount; ++i) {
- auto it = std::find_if(
- login_prompt_observer_.handlers().begin(),
- login_prompt_observer_.handlers().end(),
- [&seen_realms](LoginHandler* handler) {
- return seen_realms.count(handler->auth_info()->realm) == 0;
- });
- ASSERT_TRUE(it != login_prompt_observer_.handlers().end());
- seen_realms.insert((*it)->auth_info()->realm);
-
- for_each_realm_func(*it);
+ {
+ WindowedAuthNeededObserver auth_needed_waiter(controller);
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
+ auth_needed_waiter.Wait();
+ }
+
+ int n_handlers = 0;
+
+ while (n_handlers < kMultiRealmTestRealmCount) {
+ WindowedAuthNeededObserver auth_needed_waiter(controller);
+
+ while (!observer.handlers().empty()) {
+ WindowedAuthCancelledObserver auth_cancelled_waiter(controller);
+ LoginHandler* handler = *observer.handlers().begin();
+
+ ASSERT_TRUE(handler);
+ n_handlers++;
+ handler->CancelAuth();
+ auth_cancelled_waiter.Wait();
+ }
+
+ if (n_handlers < kMultiRealmTestRealmCount)
+ auth_needed_waiter.Wait();
}
load_stop_waiter.Wait();
-}
-
-// Checks that cancelling works as expected.
-IN_PROC_BROWSER_TEST_F(MultiRealmLoginPromptBrowserTest,
- MultipleRealmCancellation) {
- RunTest([this](LoginHandler* handler) {
- WindowedAuthCancelledObserver waiter(GetNavigationController());
- handler->CancelAuth();
- waiter.Wait();
- });
-
- EXPECT_EQ(0, login_prompt_observer()->auth_supplied_count());
- EXPECT_LT(0, login_prompt_observer()->auth_needed_count());
- EXPECT_LT(0, login_prompt_observer()->auth_cancelled_count());
-}
-
-// Checks that supplying credentials works as expected.
-IN_PROC_BROWSER_TEST_F(MultiRealmLoginPromptBrowserTest,
- MultipleRealmConfirmation) {
- RunTest([this](LoginHandler* handler) {
- WindowedAuthSuppliedObserver waiter(GetNavigationController());
- SetAuthFor(handler);
- waiter.Wait();
- });
-
- EXPECT_LT(0, login_prompt_observer()->auth_needed_count());
- EXPECT_LT(0, login_prompt_observer()->auth_supplied_count());
- EXPECT_EQ(0, login_prompt_observer()->auth_cancelled_count());
+
+ EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers);
+ EXPECT_EQ(0, observer.auth_supplied_count());
+ EXPECT_LT(0, observer.auth_needed_count());
+ EXPECT_LT(0, observer.auth_cancelled_count());
+}
+
+// Similar to the MultipleRealmCancellation test above, but tests
+// whether supplying credentials work as exepcted.
+IN_PROC_BROWSER_TEST_F(LoginPromptBrowserTest, MultipleRealmConfirmation) {
+ ASSERT_TRUE(embedded_test_server()->Start());
+ GURL test_page = embedded_test_server()->GetURL(kMultiRealmTestPage);
+
+ content::WebContents* contents =
+ browser()->tab_strip_model()->GetActiveWebContents();
+ NavigationController* controller = &contents->GetController();
+ LoginPromptBrowserTestObserver observer;
+
+ observer.Register(content::Source<NavigationController>(controller));
+
+ WindowedLoadStopObserver load_stop_waiter(controller, 1);
+ int n_handlers = 0;
+
+ {
+ WindowedAuthNeededObserver auth_needed_waiter(controller);
+
+ browser()->OpenURL(OpenURLParams(test_page, Referrer(),
+ WindowOpenDisposition::CURRENT_TAB,
+ ui::PAGE_TRANSITION_TYPED, false));
+ auth_needed_waiter.Wait();
+ }
+
+ while (n_handlers < kMultiRealmTestRealmCount) {
+ WindowedAuthNeededObserver auth_needed_waiter(controller);
+
+ while (!observer.handlers().empty()) {
+ WindowedAuthSuppliedObserver auth_supplied_waiter(controller);
+ LoginHandler* handler = *observer.handlers().begin();
+
+ ASSERT_TRUE(handler);
+ n_handlers++;
+ SetAuthFor(handler);
+ auth_supplied_waiter.Wait();
+ }
+
+ if (n_handlers < kMultiRealmTestRealmCount)
+ auth_needed_waiter.Wait();
+ }
+
+ load_stop_waiter.Wait();
+
+ EXPECT_EQ(kMultiRealmTestRealmCount, n_handlers);
+ EXPECT_LT(0, observer.auth_needed_count());
+ EXPECT_LT(0, observer.auth_supplied_count());
+ EXPECT_EQ(0, observer.auth_cancelled_count());
}
// Testing for recovery from an incorrect password for the case where

Powered by Google App Engine
This is Rietveld 408576698