original change

net/socket_stream/socket_stream_job.h

Index: net/socket_stream/socket_stream_job.h
===================================================================
--- net/socket_stream/socket_stream_job.h	(revision 256594)
+++ net/socket_stream/socket_stream_job.h	(working copy)
@@ -15,6 +15,7 @@
 
 namespace net {
 
+class CookieStore;
 class SSLConfigService;
 class SSLInfo;
 class TransportSecurityState;
@@ -30,7 +31,9 @@
  public:
   // Callback function implemented by protocol handlers to create new jobs.
   typedef SocketStreamJob* (ProtocolFactory)(const GURL& url,
-                                             SocketStream::Delegate* delegate);
+                                             SocketStream::Delegate* delegate,
+                                             URLRequestContext* context,
+                                             CookieStore* cookie_store);
 
   static ProtocolFactory* RegisterProtocolFactory(const std::string& scheme,
                                                   ProtocolFactory* factory);
@@ -39,7 +42,9 @@
       const GURL& url,
       SocketStream::Delegate* delegate,
       TransportSecurityState* sts,
-      SSLConfigService* ssl);
+      SSLConfigService* ssl,
+      URLRequestContext* context,
+      CookieStore* cookie_store);
 
   SocketStreamJob();
   void InitSocketStream(SocketStream* socket) {
@@ -52,9 +57,8 @@
   URLRequestContext* context() const {
     return socket_.get() ? socket_->context() : 0;
   }
-  void set_context(URLRequestContext* context) {
-    if (socket_.get())
-      socket_->set_context(context);
+  CookieStore* cookie_store() const {
+    return socket_.get() ? socket_->cookie_store() : 0;
   }
 
   virtual void Connect();
@@ -73,6 +77,8 @@
 
   virtual void DetachDelegate();
 
+  virtual void DetachContext();
+
  protected:
   friend class WebSocketJobTest;
   friend class base::RefCountedThreadSafe<SocketStreamJob>;