Android device manager should not drop WebSocket frame data even if it arrives together with handsh…

chrome/browser/devtools/device/android_device_manager.h

Index: chrome/browser/devtools/device/android_device_manager.h
diff --git a/chrome/browser/devtools/device/android_device_manager.h b/chrome/browser/devtools/device/android_device_manager.h
index 831b13de2cd67f306febf348ee4099913367bb9d..15bcc59ef6864f14c144ebf9c5ea5f3ab2040242 100644
--- a/chrome/browser/devtools/device/android_device_manager.h
+++ b/chrome/browser/devtools/device/android_device_manager.h
@@ -24,7 +24,10 @@ class AndroidDeviceManager : public base::NonThreadSafe {
   typedef base::Callback<void(int result, scoped_ptr<net::StreamSocket>)>
       SocketCallback;
   typedef base::Callback<void(

[dgozman, 2015/04/09 14:05:22]

nit: while you are here, please move from "typedef" to "using".

[tyoshino (SeeGerritForStatus), 2015/04/14 12:24:33]

Done.

-      int result, const std::string& extensions, scoped_ptr<net::StreamSocket>)>
+      int result,
+      const std::string& extensions,
+      const std::string& body_head,
+      scoped_ptr<net::StreamSocket>)>
       HttpUpgradeCallback;
   typedef base::Callback<void(const std::vector<std::string>&)> SerialsCallback;
 
@@ -81,8 +84,11 @@ class AndroidDeviceManager : public base::NonThreadSafe {
         const std::string& socket_name,
         const std::string& url,
         AndroidWebSocket::Delegate* delegate);
+    // |body_head| should contain the body (WebSocket frame data) part that has

[dgozman, 2015/04/09 14:05:22]

I think this comment belongs to |HttpUpgradeCallback| definition above.

[tyoshino (SeeGerritForStatus), 2015/04/14 12:24:33]

Done.

+    // been read during processing the header (WebSocket handshake).
     void Connected(int result,
                    const std::string& extensions,
+                   const std::string& body_head,
                    scoped_ptr<net::StreamSocket> socket);
     void OnFrameRead(const std::string& message);
     void OnSocketClosed();