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

net/websockets/websocket_job.cc

 // 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.
 
 #include "net/websockets/websocket_job.h"
 
 #include <algorithm>
 
 #include "base/lazy_instance.h"
 #include "base/string_tokenizer.h"
@@ skipping 35 matching lines @@
   }
 };
 
 static base::LazyInstance<WebSocketJobInitSingleton> g_websocket_job_init(
     base::LINKER_INITIALIZED);
 
 }  // anonymous namespace
 
 namespace net {
 
+bool WebSocketJob::websocket_over_spdy_ = false;
+
 // static
 void WebSocketJob::EnsureInit() {
   g_websocket_job_init.Get();
 }
 
+// static
+void WebSocketJob::EnableWebSocketOverSpdy(bool enable)

[Yuta Kitamura, 2011/05/20 02:59:48]

I'm a bit worried about inter-thread race condition; this code is probably
harmless but we need to make sure it's really okay.

You can probably check out how --use-spdy is handled.

[Takashi Toyoshima, 2011/05/20 05:25:40]

Good point.
Actually, current caller point is after I/O thread start.
It could cause race.

I change the point. I believe the best position is in
InitializeNetworkOptions(), but there we could not handle about:flags. So I move
it just after about:flags handling. I can set this before any other threads run.

+{

[Yuta Kitamura, 2011/05/20 02:59:48]

Opening brace should be put in the same line as the last function arguments.

[Takashi Toyoshima, 2011/05/20 05:25:40]

Done.
Sorry for poor mistake.

+  websocket_over_spdy_ = enable;
+}
+
 WebSocketJob::WebSocketJob(SocketStream::Delegate* delegate)
     : delegate_(delegate),
       state_(INITIALIZED),
       waiting_(false),
       callback_(NULL),
       handshake_request_(new WebSocketHandshakeRequestHandler),
       handshake_response_(new WebSocketHandshakeResponseHandler),
       handshake_request_sent_(0),
       response_cookies_save_index_(0),
       send_frame_handler_(new WebSocketFrameHandler),
@@ skipping 398 matching lines @@
       socket_->Close();
     return;
   }
   current_buffer_ = new DrainableIOBuffer(
       send_frame_handler_->GetCurrentBuffer(),
       send_frame_handler_->GetCurrentBufferSize());
   socket_->SendData(current_buffer_->data(), current_buffer_->BytesRemaining());
 }
 
 }  // namespace net