Revert 63578 - Release ChromeURLRequestContextGetters' references on IO thread shutdown.

We register all ChromeURLRequestContextGetters that have a reference to a ChromeURLRequestContext with the IOThread.  We unregister them when they go away.  In IOThread::CleanUp(), we tell the known ChromeURLRequestContextGetters to release their references to ChromeURLRequestContexts.

BUG=58859
TEST=none

Review URL: http://codereview.chromium.org/3686003

TBR=willchan@chromium.org
Review URL: http://codereview.chromium.org/4014010

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

1 files changed, 1 insertions, 22 deletions

diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 68abe75..2baec87 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -6,8 +6,8 @@
 #define CHROME_BROWSER_IO_THREAD_H_
 #pragma once
 
-#include <list>
 #include <set>
+
 #include "base/basictypes.h"
 #include "base/ref_counted.h"
 #include "base/scoped_ptr.h"
@@ -17,7 +17,6 @@
 #include "net/base/network_change_notifier.h"
 
 class ChromeNetLog;
-class ChromeURLRequestContextGetter;
 class ListValue;
 class URLRequestContext;
 
@@ -67,21 +66,6 @@ class IOThread : public BrowserProcessSubThread {
                             ListValue* referral_list,
                             bool preconnect_enabled);
 
-  // Registers |url_request_context_getter| into the IO thread.  During
-  // IOThread::CleanUp(), IOThread will iterate through known getters and
-  // release their URLRequestContexts.  Only called on the IO thread.  It does
-  // not acquire a refcount for |url_request_context_getter|.  If
-  // |url_request_context_getter| is being deleted before IOThread::CleanUp() is
-  // invoked, then this needs to be balanced with a call to
-  // UnregisterURLRequestContextGetter().
-  void RegisterURLRequestContextGetter(
-      ChromeURLRequestContextGetter* url_request_context_getter);
-
-  // Unregisters |url_request_context_getter| from the IO thread.  Only called
-  // on the IO thread.
-  void UnregisterURLRequestContextGetter(
-      ChromeURLRequestContextGetter* url_request_context_getter);
-
   // Handles changing to On The Record mode.  Posts a task for this onto the
   // IOThread's message loop.
   void ChangedToOnTheRecord();
@@ -148,11 +132,6 @@ class IOThread : public BrowserProcessSubThread {
   // List of live ProxyScriptFetchers.
   ProxyScriptFetchers fetchers_;
 
-  // Keeps track of all live ChromeURLRequestContextGetters, so the
-  // ChromeURLRequestContexts can be released during
-  // IOThread::CleanUpAfterMessageLoopDestruction().
-  std::list<ChromeURLRequestContextGetter*> url_request_context_getters_;
-
   DISALLOW_COPY_AND_ASSIGN(IOThread);
 };