SSLClientSocket::IsConnected should care for internal buffers

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
new file mode 100644
index 0000000000000000000000000000000000000000..641273d0ffd4cbbdfbd31b54b2ed87341505cf83
--- /dev/null
+++ b/chrome/browser/net/websocket_browsertest.cc
@@ -0,0 +1,86 @@
+// 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 "base/string_util.h"
+#include "base/utf_string_conversions.h"
+#include "chrome/browser/ui/browser.h"
+#include "chrome/browser/ui/browser_tabstrip.h"
+#include "chrome/test/base/in_process_browser_test.h"
+#include "chrome/test/base/ui_test_utils.h"
+#include "content/public/test/browser_test_utils.h"
+#include "net/base/test_data_directory.h"
+#include "net/test/test_server.h"
+
+namespace {
+
+class WebSocketBrowserTest : public InProcessBrowserTest {
+ public:
+  WebSocketBrowserTest()
+    : ws_server_(net::TestServer::TYPE_WS,
+                 net::TestServer::kLocalhost,
+                 net::GetWebSocketTestDataDirectory()),
+      wss_server_(net::TestServer::TYPE_WSS,
+                  SSLOptions(SSLOptions::CERT_OK),
+                  net::GetWebSocketTestDataDirectory()) {
+  }
+
+ protected:
+  net::TestServer ws_server_;
+  net::TestServer wss_server_;
+
+ private:
+  typedef net::TestServer::SSLOptions SSLOptions;
+
+  DISALLOW_COPY_AND_ASSIGN(WebSocketBrowserTest);
+};
+
+// Test that the browser can handle a WebSocket frame splitted into multiple TCP
+// frames.

[wtc, 2012/12/14 22:55:14]

splitted => split 

("split" is an irregular verb.)

In TCP, these are called "packets" or "segments" (I don't know
which one), not "frames". I suggest just using "packets".

Make the same changes to the comment on lines 62-63.

[Takashi Toyoshima, 2012/12/21 07:43:03]

Thanks!

+IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SplitWebSocketFrame) {
+  // Launch a WebSocket server.
+  ASSERT_TRUE(ws_server_.Start());
+
+  // Setup page title observer.
+  content::WebContents* tab = chrome::GetActiveWebContents(browser());
+  content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
+  watcher.AlsoWaitForTitle(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_frame_check.html").ReplaceComponents(replacements));
+
+  const string16 result = watcher.WaitAndGetTitle();
+  EXPECT_TRUE(EqualsASCII(result, "PASS"));
+}
+
+// Test that the browser can handle a WebSocket frame splitted into multiple TCP
+// or SSL frames.

[wtc, 2012/12/14 22:55:14]

In SSL, these are called "records". But informally many people
call them "packets".

[Takashi Toyoshima, 2012/12/21 07:43:03]

Thanks again.
I prefer to use "records" here.
I want use these terms properly from now on :-)

+IN_PROC_BROWSER_TEST_F(WebSocketBrowserTest, SplitSecureWebSocketFrame) {
+  // Launch a secure WebSocket server.
+  ASSERT_TRUE(wss_server_.Start());
+
+  // Setup page title observer.
+  content::WebContents* tab = chrome::GetActiveWebContents(browser());
+  content::TitleWatcher watcher(tab, ASCIIToUTF16("PASS"));
+  watcher.AlsoWaitForTitle(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_frame_check.html").ReplaceComponents(replacements));
+
+  const string16 result = watcher.WaitAndGetTitle();
+  EXPECT_TRUE(EqualsASCII(result, "PASS"));
+}
+
+}  // namespace