Index: chrome/browser/net/websocket_browsertest.cc |
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc |
index ea68b62c7329ae2bb5374c6605bf8c7bc52208a1..e933ae5c128312da109dd69ef30d2f3a56fce052 100644 |
--- a/chrome/browser/net/websocket_browsertest.cc |
+++ b/chrome/browser/net/websocket_browsertest.cc |
@@ -9,6 +9,7 @@ |
#include "chrome/browser/chrome_notification_types.h" |
#include "chrome/browser/ui/browser.h" |
#include "chrome/browser/ui/login/login_prompt.h" |
+#include "chrome/browser/ui/login/login_prompt_test_utils.h" |
#include "chrome/browser/ui/tabs/tab_strip_model.h" |
#include "chrome/test/base/in_process_browser_test.h" |
#include "chrome/test/base/ui_test_utils.h" |
@@ -235,7 +236,8 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketBasicAuthInHTTPSURL) { |
// This test verifies that login details entered by the user into the login |
// prompt to authenticate the main page are re-used for WebSockets from the same |
// origin. |
-IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketBasicAuthPrompt) { |
+IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, |
+ ReuseMainPageBasicAuthCredentialsForWebSocket) { |
// Launch a basic-auth-protected WebSocket server. |
ws_server_.set_websocket_basic_auth(true); |
ASSERT_TRUE(ws_server_.Start()); |
@@ -244,7 +246,9 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketBasicAuthPrompt) { |
&browser()->tab_strip_model()->GetActiveWebContents()->GetController(); |
AutoLogin auto_login("test", "test", navigation_controller); |
+ WindowedAuthNeededObserver auth_needed_waiter(navigation_controller); |
NavigateToHTTP("connect_check.html"); |
+ auth_needed_waiter.Wait(); |
EXPECT_TRUE(auto_login.logged_in()); |
EXPECT_EQ("PASS", WaitAndGetTitle()); |