| OLD | NEW |
| 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 <string> | 5 #include <string> |
| 6 | 6 |
| 7 #include "base/macros.h" | 7 #include "base/macros.h" |
| 8 #include "base/strings/string_util.h" | 8 #include "base/strings/string_util.h" |
| 9 #include "base/strings/utf_string_conversions.h" | 9 #include "base/strings/utf_string_conversions.h" |
| 10 #include "chrome/browser/chrome_notification_types.h" | 10 #include "chrome/browser/chrome_notification_types.h" |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 162 | 162 |
| 163 IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SecureWebSocketSplitRecords) { | 163 IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SecureWebSocketSplitRecords) { |
| 164 // Launch a secure WebSocket server. | 164 // Launch a secure WebSocket server. |
| 165 ASSERT_TRUE(wss_server_.Start()); | 165 ASSERT_TRUE(wss_server_.Start()); |
| 166 | 166 |
| 167 NavigateToHTTPS("split_packet_check.html"); | 167 NavigateToHTTPS("split_packet_check.html"); |
| 168 | 168 |
| 169 EXPECT_EQ("PASS", WaitAndGetTitle()); | 169 EXPECT_EQ("PASS", WaitAndGetTitle()); |
| 170 } | 170 } |
| 171 | 171 |
| 172 IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SendCloseFrameWhenTabIsClosed) { | 172 // Flaky failing on Win10 only. http://crbug.com/616958 |
| 173 #if defined(OS_WIN) |
| 174 #define MAYBE_SendCloseFrameWhenTabIsClosed \ |
| 175 DISABLED_SendCloseFrameWhenTabIsClosed |
| 176 #else |
| 177 #define MAYBE_SendCloseFrameWhenTabIsClosed SendCloseFrameWhenTabIsClosed |
| 178 #endif |
| 179 |
| 180 IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, |
| 181 MAYBE_SendCloseFrameWhenTabIsClosed) { |
| 173 // Launch a WebSocket server. | 182 // Launch a WebSocket server. |
| 174 ASSERT_TRUE(ws_server_.Start()); | 183 ASSERT_TRUE(ws_server_.Start()); |
| 175 | 184 |
| 176 { | 185 { |
| 177 // Create a new tab, establish a WebSocket connection and close the tab. | 186 // Create a new tab, establish a WebSocket connection and close the tab. |
| 178 content::WebContents* tab = | 187 content::WebContents* tab = |
| 179 browser()->tab_strip_model()->GetActiveWebContents(); | 188 browser()->tab_strip_model()->GetActiveWebContents(); |
| 180 content::WebContents* new_tab = content::WebContents::Create( | 189 content::WebContents* new_tab = content::WebContents::Create( |
| 181 content::WebContents::CreateParams(tab->GetBrowserContext())); | 190 content::WebContents::CreateParams(tab->GetBrowserContext())); |
| 182 browser()->tab_strip_model()->AppendWebContents(new_tab, true); | 191 browser()->tab_strip_model()->AppendWebContents(new_tab, true); |
| (...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 338 // disallows connections to unencrypted WebSockets from encrypted pages. | 347 // disallows connections to unencrypted WebSockets from encrypted pages. |
| 339 GURL http_url = | 348 GURL http_url = |
| 340 http_server.GetURL("/websocket/check-hsts.html#" + ws_url.spec()); | 349 http_server.GetURL("/websocket/check-hsts.html#" + ws_url.spec()); |
| 341 | 350 |
| 342 ui_test_utils::NavigateToURL(browser(), http_url); | 351 ui_test_utils::NavigateToURL(browser(), http_url); |
| 343 | 352 |
| 344 EXPECT_EQ("PASS", WaitAndGetTitle()); | 353 EXPECT_EQ("PASS", WaitAndGetTitle()); |
| 345 } | 354 } |
| 346 | 355 |
| 347 } // namespace | 356 } // namespace |
| OLD | NEW |