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/profile.h"
+#include "chrome/browser/net/chrome_url_request_context.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"
 
+
 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::GetReuqestContext() doesn't check request_id

[eroman, 2010/12/03 06:16:39]

typo: RequestContext

[ukai, 2010/12/07 02:21:04]

Done.

+  // 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.

[Randy Smith (Not in Mondays), 2010/11/30 18:17:47]

So the problem I have with this approach is that, to me, it violates the
GetRequestContext abstraction because we're basing how we call GetRequestContext
based on what we know of the implementations of it.  But that kind of judgment
is better made by someone who is well versed in how the code is used and what
abstractions actually matter to respect, and that's not me.  So I'm willing to
defer to Eric's opinion, and piggyback my LGTM (for this issue) on his.  Eric?

(If you have an alternative way to fix this, you might just want to postpone the
fix until you can fix it properly--an incognito mode violation isn't a *good*
thing, but is it extra-high priority to fix right now?  And if so, can that be
turned towards freeing up time to fix it in the alternative fashion?)

+  ViewHostMsg_Resource_Request request_data;
+  request_data.resource_type = ResourceType::LAST_TYPE;
+  ChromeURLRequestContext* context = static_cast<ChromeURLRequestContext*>(

[Randy Smith (Not in Mondays), 2010/11/30 18:17:47]

Why make context of type ChromeURLRequestContext rather than URLRequestContext? 
It doesn't look like you use any methods on it, and that would get rid of a lot
of casts.  Am I missing something?

[ukai, 2010/12/07 02:21:04]

Done.

+      receiver_->GetRequestContext(0, request_data));
+  if (!context) {
+    URLRequestContextGetter* context_getter =
+        Profile::GetDefaultRequestContext();
+    if (context_getter)
+      context = static_cast<ChromeURLRequestContext*>(
+          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)));
 }