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

chrome/browser/devtools/device/android_device_manager.h

 // Copyright 2014 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.
 
 #ifndef CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 #define CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "chrome/browser/profiles/profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "ui/gfx/geometry/size.h"
 
 namespace net {
 class StreamSocket;
 }
 
 class AndroidDeviceManager : public base::NonThreadSafe {
  public:
   typedef base::Callback<void(int, const std::string&)> CommandCallback;
   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;
 
   struct BrowserInfo {
     BrowserInfo();
 
     enum Type {
       kTypeChrome,
       kTypeWebView,
       kTypeOther
@@ skipping 36 matching lines @@
 
    private:
     friend class Device;
     class WebSocketImpl;
 
     AndroidWebSocket(
         scoped_refptr<Device> device,
         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();
     void Terminate();
 
     Device* device_;
     WebSocketImpl* socket_impl_;
     Delegate* delegate_;
     base::WeakPtrFactory<AndroidWebSocket> weak_factory_;
     DISALLOW_COPY_AND_ASSIGN(AndroidWebSocket);
@@ skipping 134 matching lines @@
   typedef std::map<std::string, base::WeakPtr<Device> > DeviceWeakMap;
 
   scoped_refptr<HandlerThread> handler_thread_;
   DeviceProviders providers_;
   DeviceWeakMap devices_;
 
   base::WeakPtrFactory<AndroidDeviceManager> weak_factory_;
 };
 
 #endif  // CHROME_BROWSER_DEVTOOLS_DEVICE_ANDROID_DEVICE_MANAGER_H_