Store context in scoped_refptr between tasks.

BUG=344654

Review URL: https://codereview.chromium.org/265053002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@267918 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 5 insertions, 2 deletions

diff --git a/content/shell/geolocation/shell_access_token_store.cc b/content/shell/geolocation/shell_access_token_store.cc
index cec481d..bdcf699 100644
--- a/content/shell/geolocation/shell_access_token_store.cc
+++ b/content/shell/geolocation/shell_access_token_store.cc
@@ -45,7 +45,8 @@ void ShellAccessTokenStore::RespondOnOriginatingThread(
   // we provide a dummy access_token set to avoid hitting the server.
   AccessTokenSet access_token_set;
   access_token_set[GURL()] = base::ASCIIToUTF16("chromium_content_shell");
-  callback.Run(access_token_set, system_request_context_);
+  callback.Run(access_token_set, system_request_context_.get());
+  system_request_context_ = NULL;
 }
 
 void ShellAccessTokenStore::SaveAccessToken(
diff --git a/content/shell/geolocation/shell_access_token_store.h b/content/shell/geolocation/shell_access_token_store.h
index 0345b8c..e97ce36 100644
--- a/content/shell/geolocation/shell_access_token_store.h
+++ b/content/shell/geolocation/shell_access_token_store.h
@@ -5,7 +5,9 @@
 #ifndef CONTENT_SHELL_GEOLOCATION_SHELL_ACCESS_TOKEN_STORE_H_
 #define CONTENT_SHELL_GEOLOCATION_SHELL_ACCESS_TOKEN_STORE_H_
 
+#include "base/memory/ref_counted.h"
 #include "content/public/browser/access_token_store.h"
+#include "net/url_request/url_request_context_getter.h"
 
 namespace content {
 class ShellBrowserContext;
@@ -31,7 +33,7 @@ class ShellAccessTokenStore : public content::AccessTokenStore {
       const GURL& server_url, const base::string16& access_token) OVERRIDE;
 
   content::ShellBrowserContext* shell_browser_context_;
-  net::URLRequestContextGetter* system_request_context_;
+  scoped_refptr<net::URLRequestContextGetter> system_request_context_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellAccessTokenStore);
 };