Revert 256579 "Allow the content browser client to specify a spe..."

trunk/src/net/socket_stream/socket_stream_job.h

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