From 93bbc0bca9fbb6d8290e900e1f82d5619c0bbff4 Mon Sep 17 00:00:00 2001
From: Cheng Zhao <zcbenz@gmail.com>
Date: Wed, 9 Sep 2015 19:27:28 +0800
Subject: [PATCH] Don't reference RequestContextGetter in JS objects

V8 doesn't guarrentee the C++ class of JS objects will get destroyed, so
this will result in RequestContextGetter never getting freed
---
 atom/browser/api/atom_api_cookies.h  | 2 +-
 atom/browser/api/atom_api_protocol.h | 6 +++---
 atom/browser/net/js_asker.h          | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/atom/browser/api/atom_api_cookies.h b/atom/browser/api/atom_api_cookies.h
index 12cf4a220979..0c309b3f18ee 100644
--- a/atom/browser/api/atom_api_cookies.h
+++ b/atom/browser/api/atom_api_cookies.h
@@ -78,7 +78,7 @@ class Cookies : public mate::Wrappable {
   // Must be called on IO thread.
   net::CookieStore* GetCookieStore();
 
-  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  net::URLRequestContextGetter* request_context_getter_;
 
   DISALLOW_COPY_AND_ASSIGN(Cookies);
 };
diff --git a/atom/browser/api/atom_api_protocol.h b/atom/browser/api/atom_api_protocol.h
index 966fcd8726b3..9f98eb767309 100644
--- a/atom/browser/api/atom_api_protocol.h
+++ b/atom/browser/api/atom_api_protocol.h
@@ -66,7 +66,7 @@ class Protocol : public mate::Wrappable {
    public:
     CustomProtocolHandler(
         v8::Isolate* isolate,
-        scoped_refptr<net::URLRequestContextGetter> request_context,
+        net::URLRequestContextGetter* request_context,
         const Handler& handler)
         : isolate_(isolate),
           request_context_(request_context),
@@ -83,7 +83,7 @@ class Protocol : public mate::Wrappable {
 
    private:
     v8::Isolate* isolate_;
-    scoped_refptr<net::URLRequestContextGetter> request_context_;
+    net::URLRequestContextGetter* request_context_;
     Protocol::Handler handler_;
 
     DISALLOW_COPY_AND_ASSIGN(CustomProtocolHandler);
@@ -172,7 +172,7 @@ class Protocol : public mate::Wrappable {
   // Convert error code to string.
   std::string ErrorCodeToString(ProtocolError error);
 
-  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  net::URLRequestContextGetter* request_context_getter_;
 
   // Map that stores the original protocols of schemes.
   using OriginalProtocolsMap = base::ScopedPtrHashMap<
diff --git a/atom/browser/net/js_asker.h b/atom/browser/net/js_asker.h
index 9c45446abcbb..8ec245ee8c4f 100644
--- a/atom/browser/net/js_asker.h
+++ b/atom/browser/net/js_asker.h
@@ -46,7 +46,7 @@ class JsAsker : public RequestJob {
   // Called by |CustomProtocolHandler| to store handler related information.
   void SetHandlerInfo(
       v8::Isolate* isolate,
-      scoped_refptr<net::URLRequestContextGetter> request_context_getter,
+      net::URLRequestContextGetter* request_context_getter,
       const JavaScriptHandler& handler) {
     isolate_ = isolate;
     request_context_getter_ = request_context_getter;
@@ -57,7 +57,7 @@ class JsAsker : public RequestJob {
   virtual void StartAsync(scoped_ptr<base::Value> options) = 0;
 
   net::URLRequestContextGetter* request_context_getter() const {
-    return request_context_getter_.get();
+    return request_context_getter_;
   }
 
  private:
@@ -89,7 +89,7 @@ class JsAsker : public RequestJob {
   }
 
   v8::Isolate* isolate_;
-  scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
+  net::URLRequestContextGetter* request_context_getter_;
   JavaScriptHandler handler_;
 
   base::WeakPtrFactory<JsAsker> weak_factory_;