Fix up ordering in ProfileIOData.

chrome/browser/profiles/profile_io_data.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 CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #define CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_
 #pragma once
 
 #include <string>
 
@@ skipping 67 matching lines @@
   scoped_refptr<ChromeURLRequestContext> GetMediaRequestContext() const;
   scoped_refptr<ChromeURLRequestContext> GetExtensionsRequestContext() const;
   scoped_refptr<ChromeURLRequestContext> GetIsolatedAppRequestContext(
       scoped_refptr<ChromeURLRequestContext> main_context,
       const std::string& app_id) const;
 
   // These are useful when the Chrome layer is called from the content layer
   // with a content::ResourceContext, and they want access to Chrome data for
   // that profile.
   ExtensionInfoMap* GetExtensionInfoMap() const;
-  HostContentSettingsMap* GetHostContentSettingsMap() const;
   CookieSettings* GetCookieSettings() const;
 
 #if defined(ENABLE_NOTIFICATIONS)
   DesktopNotificationService* GetNotificationService() const;
 #endif
 
   BooleanPrefMember* clear_local_state_on_exit()  const {
     return &clear_local_state_on_exit_;
   }
 
@@ skipping 36 matching lines @@
     ProfileParams();
     ~ProfileParams();
 
     FilePath path;
     bool is_incognito;
     bool clear_local_state_on_exit;
     std::string accept_language;
     std::string accept_charset;
     std::string referrer_charset;
     IOThread* io_thread;
-    scoped_refptr<HostContentSettingsMap> host_content_settings_map;
     scoped_refptr<CookieSettings> cookie_settings;
     scoped_refptr<net::SSLConfigService> ssl_config_service;
     scoped_refptr<net::CookieMonster::Delegate> cookie_monster_delegate;
     scoped_refptr<ExtensionInfoMap> extension_info_map;
 
 #if defined(ENABLE_NOTIFICATIONS)
     DesktopNotificationService* notification_service;
 #endif
 
     scoped_refptr<ProtocolHandlerRegistry> protocol_handler_registry;
@@ skipping 54 matching lines @@
     return job_factory_.get();
   }
 
   void set_http_server_properties_manager(
       chrome_browser_net::HttpServerPropertiesManager* manager) const;
 
   ChromeURLRequestContext* main_request_context() const {
     return main_request_context_;
   }
 
+  // Destroys the ResourceContext first, to cancel any URLRequests that are
+  // using it still, before we destroy the member variables that those
+  // URLRequests may be accessing.
+  void DestroyResourceContext();
+
  private:
   class ResourceContext : public content::ResourceContext {
    public:
     explicit ResourceContext(ProfileIOData* io_data);
     virtual ~ResourceContext();
 
+    // ResourceContext implementation:
+    virtual net::HostResolver* GetHostResolver() OVERRIDE;
+    virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
+
    private:
     friend class ProfileIOData;
 
-    // ResourceContext implementation:
-    virtual net::HostResolver* GetHostResolver() OVERRIDE;
-    virtual net::URLRequestContext* GetRequestContext() OVERRIDE;
     void EnsureInitialized();
 
     ProfileIOData* const io_data_;
 
     net::HostResolver* host_resolver_;
     net::URLRequestContext* request_context_;
   };
 
   typedef base::hash_map<std::string, scoped_refptr<ChromeURLRequestContext> >
       AppRequestContextMap;
@@ skipping 14 matching lines @@
 
   // These functions are used to transfer ownership of the lazily initialized
   // context from ProfileIOData to the URLRequestContextGetter.
   virtual scoped_refptr<ChromeURLRequestContext>
       AcquireMediaRequestContext() const = 0;
   virtual scoped_refptr<ChromeURLRequestContext>
       AcquireIsolatedAppRequestContext(
           scoped_refptr<ChromeURLRequestContext> main_context,
           const std::string& app_id) const = 0;
 
+  // The order *DOES* matter for the majority of these member variables, so
+  // don't move them around unless you know what you're doing!
+  // General rules:
+  //   * ResourceContext references the URLRequestContexts, so
+  //   URLRequestContexts must outlive ResourceContext, hence ResourceContext
+  //   should be destroyed first.
+  //   * URLRequestContexts reference a whole bunch of members, so
+  //   URLRequestContext needs to be destroyed before them.
+  //   * Therefore, ResourceContext should be listed last, and then the
+  //   URLRequestContexts, and then the URLRequestContext members.
+  //   * Note that URLRequestContext members have a directed dependency graph
+  //   too, so they must themselves be ordered correctly.
+
   // Tracks whether or not we've been lazily initialized.
   mutable bool initialized_;
 
   // Data from the UI thread from the Profile, used to initialize ProfileIOData.
   // Deleted after lazy initialization.
   mutable scoped_ptr<ProfileParams> profile_params_;
 
   // Member variables which are pointed to by the various context objects.
   mutable BooleanPrefMember enable_referrers_;
   mutable BooleanPrefMember clear_local_state_on_exit_;
@@ skipping 10 matching lines @@
   mutable scoped_ptr<net::ServerBoundCertService> server_bound_cert_service_;
   mutable scoped_ptr<net::NetworkDelegate> network_delegate_;
   mutable scoped_ptr<net::FraudulentCertificateReporter>
       fraudulent_certificate_reporter_;
   mutable scoped_ptr<net::ProxyService> proxy_service_;
   mutable scoped_ptr<net::TransportSecurityState> transport_security_state_;
   mutable scoped_ptr<net::URLRequestJobFactory> job_factory_;
   mutable scoped_ptr<chrome_browser_net::HttpServerPropertiesManager>
       http_server_properties_manager_;
 
-  // Pointed to by ResourceContext.
-
-  // TODO(willchan): Remove from ResourceContext.
-  mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
-  mutable scoped_refptr<HostContentSettingsMap> host_content_settings_map_;
-  mutable scoped_refptr<CookieSettings> cookie_settings_;
-
 #if defined(ENABLE_NOTIFICATIONS)
   mutable DesktopNotificationService* notification_service_;
 #endif
 
-  mutable ResourceContext resource_context_;
-
   mutable scoped_ptr<TransportSecurityPersister>
       transport_security_persister_;
 
   // These are only valid in between LazyInitialize() and their accessor being
   // called.
   mutable scoped_refptr<ChromeURLRequestContext> main_request_context_;
   mutable scoped_refptr<ChromeURLRequestContext> extensions_request_context_;
   // One AppRequestContext per isolated app.
   mutable AppRequestContextMap app_request_context_map_;
 
+  mutable scoped_ptr<ResourceContext> resource_context_;
+
+  mutable scoped_refptr<ExtensionInfoMap> extension_info_map_;
+  mutable scoped_refptr<CookieSettings> cookie_settings_;
+
   // TODO(jhawkins): Remove once crbug.com/102004 is fixed.
   bool initialized_on_UI_thread_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileIOData);
 };
 
 #endif  // CHROME_BROWSER_PROFILES_PROFILE_IO_DATA_H_