[WebSocket] Send a close frame when the renderer process is gone.

chrome/browser/net/websocket_browsertest.cc

Index: chrome/browser/net/websocket_browsertest.cc
diff --git a/chrome/browser/net/websocket_browsertest.cc b/chrome/browser/net/websocket_browsertest.cc
index 58605de17472bd041be93ceaeb05db77567c0670..4e82bc165152ef0b5e298c1f1796d91895a38c61 100644
--- a/chrome/browser/net/websocket_browsertest.cc
+++ b/chrome/browser/net/websocket_browsertest.cc
@@ -29,6 +29,26 @@ class WebSocketBrowserTest : public InProcessBrowserTest {
   net::SpawnedTestServer ws_server_;
   net::SpawnedTestServer wss_server_;
 
+  void NavigateToHTTP(const std::string& path) {
+      // Visit a HTTP page for testing.
+      std::string scheme("http");
+      GURL::Replacements replacements;
+      replacements.SetSchemeStr(scheme);
+      ui_test_utils::NavigateToURL(
+          browser(),
+          ws_server_.GetURL(path).ReplaceComponents(replacements));
+  }
+
+  void NavigateToHTTPS(const std::string& path) {
+      // Visit a HTTPS page for testing.
+      std::string scheme("https");
+      GURL::Replacements replacements;
+      replacements.SetSchemeStr(scheme);
+      ui_test_utils::NavigateToURL(
+          browser(),
+          wss_server_.GetURL(path).ReplaceComponents(replacements));
+  }
+
  private:
   typedef net::SpawnedTestServer::SSLOptions SSLOptions;
 
@@ -47,14 +67,7 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, WebSocketSplitSegments) {
   content::TitleWatcher watcher(tab, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
-  // Visit a HTTP page for testing.
-  std::string scheme("http");
-  GURL::Replacements replacements;
-  replacements.SetSchemeStr(scheme);
-  ui_test_utils::NavigateToURL(
-      browser(),
-      ws_server_.GetURL(
-          "split_packet_check.html").ReplaceComponents(replacements));
+  NavigateToHTTP("split_packet_check.html");
 
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_TRUE(EqualsASCII(result, "PASS"));
@@ -70,17 +83,43 @@ IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SecureWebSocketSplitRecords) {
   content::TitleWatcher watcher(tab, base::ASCIIToUTF16("PASS"));
   watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
 
-  // Visit a HTTPS page for testing.
-  std::string scheme("https");
-  GURL::Replacements replacements;
-  replacements.SetSchemeStr(scheme);
-  ui_test_utils::NavigateToURL(
-      browser(),
-      wss_server_.GetURL(
-          "split_packet_check.html").ReplaceComponents(replacements));
+  NavigateToHTTPS("split_packet_check.html");
 
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_TRUE(EqualsASCII(result, "PASS"));
 }
 
+IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SendCloseFrameWhenTabIsClosed) {
+  // Launch a secure WebSocket server.

[Adam Rice, 2014/07/14 10:17:20]

Remove the word "secure".

[yhirano, 2014/07/14 11:24:35]

Done.

+  ASSERT_TRUE(ws_server_.Start());
+
+  content::WebContents* tab =
+      browser()->tab_strip_model()->GetActiveWebContents();
+  {
+    // Create a new tab, establish a WebSocket connection and close the tab.
+    content::WebContents* newTab =
+        content::WebContents::Create(
+            content::WebContents::CreateParams(tab->GetBrowserContext()));
+    browser()->tab_strip_model()->AppendWebContents(newTab, true);
+    ASSERT_EQ(newTab, browser()->tab_strip_model()->GetWebContentsAt(1));
+    content::TitleWatcher title_watcher(newTab,
+                                        base::ASCIIToUTF16("CONNECTED"));
+    title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("CLOSED"));
+    content::WebContentsDestroyedWatcher destroyed_watcher(newTab);
+
+    NavigateToHTTP("connect.html");

[Adam Rice, 2014/07/14 10:31:30]

The name "connect.html" is too generic. How about "counted-connection.html" so
it is easy to associate with "count-connection.html" used by the same test.

[yhirano, 2014/07/14 11:24:35]

Done.

+    const base::string16 result = title_watcher.WaitAndGetTitle();
+    EXPECT_TRUE(EqualsASCII(result, "CONNECTED"));
+    browser()->tab_strip_model()->CloseWebContentsAt(1, 0);
+    destroyed_watcher.Wait();
+  }
+
+  content::TitleWatcher title_watcher(tab, base::ASCIIToUTF16("PASS"));
+  title_watcher.AlsoWaitForTitle(base::ASCIIToUTF16("FAIL"));
+
+  NavigateToHTTP("count-connection.html");
+  const base::string16 result = title_watcher.WaitAndGetTitle();
+  EXPECT_TRUE(EqualsASCII(result, "PASS"));
+}
+
 }  // namespace