Switch to using scoped_ptr with UserData

content/browser/appcache/appcache_interceptor.cc

 // Copyright 2014 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.
 
 #include "content/browser/appcache/appcache_interceptor.h"
 
+#include <utility>
+
 #include "base/debug/crash_logging.h"
 #include "content/browser/appcache/appcache_backend_impl.h"
 #include "content/browser/appcache/appcache_host.h"
 #include "content/browser/appcache/appcache_request_handler.h"
 #include "content/browser/appcache/appcache_service_impl.h"
 #include "content/browser/appcache/appcache_url_request_job.h"
 #include "content/browser/appcache/chrome_appcache_service.h"
 #include "content/browser/bad_message.h"
 #include "content/browser/loader/resource_message_filter.h"
 #include "content/browser/loader/resource_requester_info.h"
 #include "content/common/appcache_interfaces.h"
 #include "net/url_request/url_request.h"
 
 static int kHandlerKey;  // Value is not used.
 
 namespace content {
 
-void AppCacheInterceptor::SetHandler(net::URLRequest* request,
-                                     AppCacheRequestHandler* handler) {
-  request->SetUserData(&kHandlerKey, handler);  // request takes ownership
+void AppCacheInterceptor::SetHandler(
+    net::URLRequest* request,
+    std::unique_ptr<AppCacheRequestHandler> handler) {
+  request->SetUserData(&kHandlerKey, std::move(handler));
 }
 
 AppCacheRequestHandler* AppCacheInterceptor::GetHandler(
     net::URLRequest* request) {
   return static_cast<AppCacheRequestHandler*>(
       request->GetUserData(&kHandlerKey));
 }
 
 void AppCacheInterceptor::SetExtraRequestInfo(net::URLRequest* request,
                                               AppCacheServiceImpl* service,
@@ skipping 17 matching lines @@
   SetExtraRequestInfoForHost(request, host, resource_type,
                              should_reset_appcache);
 }
 
 void AppCacheInterceptor::SetExtraRequestInfoForHost(
     net::URLRequest* request,
     AppCacheHost* host,
     ResourceType resource_type,
     bool should_reset_appcache) {
   // Create a handler for this request and associate it with the request.
-  AppCacheRequestHandler* handler =
+  std::unique_ptr<AppCacheRequestHandler> handler =
       host->CreateRequestHandler(request, resource_type, should_reset_appcache);
   if (handler)
-    SetHandler(request, handler);
+    SetHandler(request, std::move(handler));
 }
 
 void AppCacheInterceptor::GetExtraResponseInfo(net::URLRequest* request,
                                                int64_t* cache_id,
                                                GURL* manifest_url) {
   DCHECK(*cache_id == kAppCacheNoCacheId);
   DCHECK(manifest_url->is_empty());
   AppCacheRequestHandler* handler = GetHandler(request);
   if (handler)
     handler->GetExtraResponseInfo(cache_id, manifest_url);
@@ skipping 76 matching lines @@
 
 net::URLRequestJob* AppCacheInterceptor::MaybeInterceptResponse(
     net::URLRequest* request, net::NetworkDelegate* network_delegate) const {
   AppCacheRequestHandler* handler = GetHandler(request);
   if (!handler)
     return NULL;
   return handler->MaybeLoadFallbackForResponse(request, network_delegate);
 }
 
 }  // namespace content