Fix cross origin check when deciding to show the HTTP auth interstitial.

chrome/browser/net/websocket_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 <string>
 
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #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"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/browser_test_utils.h"
 #include "net/base/test_data_directory.h"
@@ skipping 206 matching lines @@
       wss_server_.GetURLWithUserAndPassword(
                       "connect_check.html", "test", "test")
           .ReplaceComponents(replacements));
 
   EXPECT_EQ("PASS", WaitAndGetTitle());
 }
 
 // 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());
 
   content::NavigationController* navigation_controller =
       &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());
 }
 
 IN_PROC_BROWSER_TEST_F(WebSocketBrowserConnectToTest,
                        WebSocketBasicAuthInWSURL) {
   // Launch a basic-auth-protected WebSocket server.
   ws_server_.set_websocket_basic_auth(true);
   ASSERT_TRUE(ws_server_.Start());
@@ skipping 21 matching lines @@
   // Launch a basic-auth-protected WebSocket server.
   ws_server_.set_websocket_basic_auth(true);
   ASSERT_TRUE(ws_server_.Start());
 
   ConnectTo(ws_server_.GetURL("echo-with-no-extension"));
 
   EXPECT_EQ("FAIL", WaitAndGetTitle());
 }
 
 }  // namespace