Checks to enforce relative lifetimes for SdchManager.

net/url_request/url_request_context.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.
 
 // This class represents contextual information (cookies, cache, etc.)
 // that's useful when processing resource requests.
 // The class is reference-counted so that it can be cleaned up after any
 // requests that are using it have been completed.
 
 #ifndef NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
 #define NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_
 
 #include <set>
 #include <string>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/non_thread_safe.h"
 #include "net/base/net_export.h"
 #include "net/base/net_log.h"
 #include "net/base/request_priority.h"
+#include "net/base/sdch_manager.h"
 #include "net/http/http_network_session.h"
 #include "net/http/http_server_properties.h"
 #include "net/http/transport_security_state.h"
 #include "net/ssl/ssl_config_service.h"
 #include "net/url_request/url_request.h"
 
 namespace net {
 class CertVerifier;
 class ChannelIDService;
 class CookieStore;
@@ skipping 146 matching lines @@
   // May be NULL.
   URLRequestThrottlerManager* throttler_manager() const {
     return throttler_manager_;
   }
   void set_throttler_manager(URLRequestThrottlerManager* throttler_manager) {
     throttler_manager_ = throttler_manager;
   }
 
   // May be NULL.
   SdchManager* sdch_manager() const {
-    return sdch_manager_;
+    // For investigation of http://crbug.com/454198; remove ?: when resolved.
+    CHECK(!have_sdch_manager_ || sdch_manager_.get());
+    return have_sdch_manager_ ? sdch_manager_.get() : NULL;
   }
   void set_sdch_manager(SdchManager* sdch_manager) {
-    sdch_manager_ = sdch_manager;
+    // For investigation of http://crbug.com/454198; simplify when resolved.
+    have_sdch_manager_ = !!sdch_manager;
+    if (have_sdch_manager_)
+      sdch_manager_ = sdch_manager->GetWeakPtr();
+    else
+      sdch_manager_.reset();
   }
 
   // Gets the URLRequest objects that hold a reference to this
   // URLRequestContext.
   std::set<const URLRequest*>* url_requests() const {
     return url_requests_.get();
   }
 
   // CHECKs that no URLRequests using this context remain. Subclasses should
   // additionally call AssertNoURLRequests() within their own destructor,
@@ skipping 28 matching lines @@
   scoped_refptr<SSLConfigService> ssl_config_service_;
   NetworkDelegate* network_delegate_;
   base::WeakPtr<HttpServerProperties> http_server_properties_;
   HttpUserAgentSettings* http_user_agent_settings_;
   scoped_refptr<CookieStore> cookie_store_;
   TransportSecurityState* transport_security_state_;
   CTVerifier* cert_transparency_verifier_;
   HttpTransactionFactory* http_transaction_factory_;
   const URLRequestJobFactory* job_factory_;
   URLRequestThrottlerManager* throttler_manager_;
-  SdchManager* sdch_manager_;
+  // For investigation of http://crbug.com/454198; remove WeakPtr when resolved.
+  bool have_sdch_manager_;
+  base::WeakPtr<SdchManager> sdch_manager_;
 
   // ---------------------------------------------------------------------------
   // Important: When adding any new members below, consider whether they need to
   // be added to CopyFrom.
   // ---------------------------------------------------------------------------
 
   scoped_ptr<std::set<const URLRequest*> > url_requests_;
 
   DISALLOW_COPY_AND_ASSIGN(URLRequestContext);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_REQUEST_CONTEXT_H_