Use proper URLRequestContext for WebSocket.

chrome/browser/renderer_host/socket_stream_host.cc

 // Copyright (c) 2010 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 "chrome/browser/renderer_host/socket_stream_host.h"
 
 #include "base/logging.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/net/socket_stream.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/render_messages.h"
+#include "chrome/common/render_messages_params.h"
 #include "net/socket_stream/socket_stream_job.h"
 

[Randy Smith (Not in Mondays), 2010/12/26 19:44:28]

Nit: Remove extra blank line.

+
 static const char* kSocketHostKey = "socketHost";
 
 class SocketStreamInfo : public net::SocketStream::UserData {
  public:
   explicit SocketStreamInfo(SocketStreamHost* host) : host_(host) {}
   virtual ~SocketStreamInfo() {}
   SocketStreamHost* host() const { return host_; }
 
  private:
   SocketStreamHost* host_;
@@ skipping 24 matching lines @@
 SocketStreamHost::~SocketStreamHost() {
   VLOG(1) << "SocketStreamHost destructed socket_id=" << socket_id_;
   if (!receiver_->Send(new ViewMsg_SocketStream_Closed(socket_id_)))
     LOG(ERROR) << "ViewMsg_SocketStream_Closed failed.";
   socket_->DetachDelegate();
 }
 
 void SocketStreamHost::Connect(const GURL& url) {
   VLOG(1) << "SocketStreamHost::Connect url=" << url;
   socket_ = net::SocketStreamJob::CreateSocketStreamJob(url, delegate_);
-  URLRequestContextGetter* context_getter = Profile::GetDefaultRequestContext();
-  if (context_getter)
-      socket_->set_context(context_getter->GetURLRequestContext());
+
+  // We use request_id==0 and request_data.resource_type=ResourceType::LAST_TYPE
+  // here.
+  // ResourceMessageFilter::GetRequestContext() doesn't check request_id
+  // and only checks request_data.resource_type is ResourceType::MEDIA or not.
+  // TODO(ukai): merge WebSocketStreamHandleBridge into ResourceLoaderBridge,
+  // so that we can use the same request_id.
+  ViewHostMsg_Resource_Request request_data;
+  request_data.resource_type = ResourceType::LAST_TYPE;
+  URLRequestContext* context = receiver_->GetRequestContext(0, request_data);
+  if (!context) {
+    URLRequestContextGetter* context_getter =
+        Profile::GetDefaultRequestContext();
+    if (context_getter)
+      context = context_getter->GetURLRequestContext();
+  }
+  socket_->set_context(context);
   socket_->SetUserData(kSocketHostKey, new SocketStreamInfo(this));
   socket_->Connect();
 }
 
 bool SocketStreamHost::SendData(const std::vector<char>& data) {
   VLOG(1) << "SocketStreamHost::SendData";
   return socket_ && socket_->SendData(&data[0], data.size());
 }
 
 void SocketStreamHost::Close() {
@@ skipping 10 matching lines @@
 
 bool SocketStreamHost::SentData(int amount_sent) {
   return receiver_->Send(new ViewMsg_SocketStream_SentData(
       socket_id_, amount_sent));
 }
 
 bool SocketStreamHost::ReceivedData(const char* data, int len) {
   return receiver_->Send(new ViewMsg_SocketStream_ReceivedData(
       socket_id_, std::vector<char>(data, data + len)));
 }