Merge r205158 (SocketStream uses a weak ptr to URLRequestContext)

chrome/browser/net/chrome_url_request_context.h

Index: chrome/browser/net/chrome_url_request_context.h
===================================================================
--- chrome/browser/net/chrome_url_request_context.h	(revision 207753)
+++ chrome/browser/net/chrome_url_request_context.h	(working copy)
@@ -41,15 +41,13 @@
   virtual ~ChromeURLRequestContext();
 
   base::WeakPtr<ChromeURLRequestContext> GetWeakPtr() {
-    return weak_factory_.GetWeakPtr();
+    return base::AsWeakPtr(this);
   }
 
   // Copies the state from |other| into this context.
   void CopyFrom(ChromeURLRequestContext* other);
 
  private:
-  base::WeakPtrFactory<ChromeURLRequestContext> weak_factory_;
-
   // ---------------------------------------------------------------------------
   // Important: When adding any new members below, consider whether they need to
   // be added to CopyFrom.