Revert a workaround commit for a UAF crash.

net/socket_stream/socket_stream.h

 // Copyright (c) 2012 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.
 
 #ifndef NET_SOCKET_STREAM_SOCKET_STREAM_H_
 #define NET_SOCKET_STREAM_SOCKET_STREAM_H_
 
 #include <deque>
 #include <map>
 #include <string>
 
 #include "base/memory/linked_ptr.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/memory/weak_ptr.h"
 #include "net/base/address_list.h"
 #include "net/base/completion_callback.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/privacy_mode.h"
 #include "net/proxy/proxy_service.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request.h"
@@ skipping 97 matching lines @@
   // delete the object if it is changed or the job is destroyed.
   UserData* GetUserData(const void* key) const;
   void SetUserData(const void* key, UserData* data);
 
   const GURL& url() const { return url_; }
   bool is_secure() const;
   const AddressList& address_list() const { return addresses_; }
   Delegate* delegate() const { return delegate_; }
   int max_pending_send_allowed() const { return max_pending_send_allowed_; }
 
-  URLRequestContext* context() { return context_.get(); }
+  URLRequestContext* context() { return context_; }
   // There're some asynchronous operations and members that are constructed from
   // |context|. Be careful when you use this for the second time or more.
   void set_context(URLRequestContext* context);
 
   const SSLConfig& server_ssl_config() const { return server_ssl_config_; }
   PrivacyMode privacy_mode() const { return privacy_mode_; }
   void CheckPrivacyMode();
 
   BoundNetLog* net_log() { return &net_log_; }
 
@@ skipping 191 matching lines @@
 
   BoundNetLog net_log_;
 
   GURL url_;
   // The number of bytes allowed to be buffered in this object. If the size of
   // buffered data which is
   //   current_write_buf_.BytesRemaining() +
   //   sum of the size of buffers in |pending_write_bufs_|
   // exceeds this limit, SendData() fails.
   int max_pending_send_allowed_;
-  base::WeakPtr<URLRequestContext> context_;
+  URLRequestContext* context_;
 
   UserDataMap user_data_;
 
   State next_state_;
   ClientSocketFactory* factory_;
 
   ProxyMode proxy_mode_;
 
   GURL proxy_url_;
   ProxyService::PacRequest* pac_request_;
@@ skipping 31 matching lines @@
   bool server_closed_;
 
   scoped_ptr<SocketStreamMetrics> metrics_;
 
   DISALLOW_COPY_AND_ASSIGN(SocketStream);
 };
 
 }  // namespace net
 
 #endif  // NET_SOCKET_STREAM_SOCKET_STREAM_H_