Add --enable-websocket-over-spdy command-line flag

net/websockets/websocket_job.h

 // Copyright (c) 2011 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 NET_WEBSOCKETS_WEBSOCKET_JOB_H_
 #define NET_WEBSOCKETS_WEBSOCKET_JOB_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 26 matching lines @@
     CONNECTING = 0,
     OPEN = 1,
     CLOSING = 2,
     CLOSED = 3,
   };
 
   explicit WebSocketJob(SocketStream::Delegate* delegate);
 
   static void EnsureInit();
 
+  // Enable or Disable WebSocket over SPDY feature.
+  // This function is intended to be called before I/O thread starts.
+  static void set_websocket_over_spdy_enabled(bool enable);

[Yuta Kitamura, 2011/05/20 08:30:33]

enable -> enabled

[Takashi Toyoshima, 2011/05/20 09:46:52]

Done.

+
   State state() const { return state_; }
   virtual void Connect();
   virtual bool SendData(const char* data, int len);
   virtual void Close();
   virtual void RestartWithAuth(
       const string16& username,
       const string16& password);
   virtual void DetachDelegate();
 
   // SocketStream::Delegate methods.
@@ skipping 28 matching lines @@
   GURL GetURLForCookies() const;
 
   const AddressList& address_list() const;
   void SetWaiting();
   bool IsWaiting() const;
   void Wakeup();
   void DoCallback();
 
   void SendPending();
 
+  static bool websocket_over_spdy_enabled_;
+
   SocketStream::Delegate* delegate_;
   State state_;
   bool waiting_;
   AddressList addresses_;
   CompletionCallback* callback_;  // for throttling.
 
   scoped_ptr<WebSocketHandshakeRequestHandler> handshake_request_;
   scoped_ptr<WebSocketHandshakeResponseHandler> handshake_response_;
 
   size_t handshake_request_sent_;
 
   std::vector<std::string> response_cookies_;
   size_t response_cookies_save_index_;
 
   scoped_ptr<WebSocketFrameHandler> send_frame_handler_;
   scoped_refptr<DrainableIOBuffer> current_buffer_;
   scoped_ptr<WebSocketFrameHandler> receive_frame_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(WebSocketJob);
 };
 
 }  // namespace
 
 #endif  // NET_WEBSOCKETS_WEBSOCKET_JOB_H_