AppCache: Use WeakPtr instead of base::Unretained for DiskCache callbacks.

webkit/appcache/appcache_response.cc

 // 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.
 
 #include "webkit/appcache/appcache_response.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
@@ skipping 230 matching lines @@
 }
 
 void AppCacheResponseReader::OpenEntryIfNeededAndContinue() {
   int rv;
   AppCacheDiskCacheInterface::Entry** entry_ptr = NULL;
   if (entry_) {
     rv = net::OK;
   } else if (!disk_cache_) {
     rv = net::ERR_FAILED;
   } else {
-    entry_ptr = new(AppCacheDiskCacheInterface::Entry*);
+    entry_ptr = new AppCacheDiskCacheInterface::Entry*;
     open_callback_ =
         base::Bind(&AppCacheResponseReader::OnOpenEntryComplete,
                    weak_factory_.GetWeakPtr(), base::Owned(entry_ptr));
     rv = disk_cache_->OpenEntry(response_id_, entry_ptr, open_callback_);
   }
 
   if (rv != net::ERR_IO_PENDING)
     OnOpenEntryComplete(entry_ptr, rv);
 }
 
@@ skipping 99 matching lines @@
   int rv;
   AppCacheDiskCacheInterface::Entry** entry_ptr = NULL;
   if (entry_) {
     creation_phase_ = NO_ATTEMPT;
     rv = net::OK;
   } else if (!disk_cache_) {
     creation_phase_ = NO_ATTEMPT;
     rv = net::ERR_FAILED;
   } else {
     creation_phase_ = INITIAL_ATTEMPT;
-    entry_ptr = new(AppCacheDiskCacheInterface::Entry*);
+    entry_ptr = new AppCacheDiskCacheInterface::Entry*;
     create_callback_ =
         base::Bind(&AppCacheResponseWriter::OnCreateEntryComplete,
-                   base::Unretained(this), base::Owned(entry_ptr));
+                   weak_factory_.GetWeakPtr(), base::Owned(entry_ptr));
     rv = disk_cache_->CreateEntry(response_id_, entry_ptr, create_callback_);
   }
   if (rv != net::ERR_IO_PENDING)
     OnCreateEntryComplete(entry_ptr, rv);
 }
 
 void AppCacheResponseWriter::OnCreateEntryComplete(
     AppCacheDiskCacheInterface::Entry** entry, int rv) {
   DCHECK(info_buffer_.get() || buffer_.get());
 
-  AppCacheDiskCacheInterface::Entry** entry_ptr = NULL;
-
   if (creation_phase_ == INITIAL_ATTEMPT) {
     if (rv != net::OK) {
       // We may try to overwrite existing entries.
       creation_phase_ = DOOM_EXISTING;
       rv = disk_cache_->DoomEntry(response_id_, create_callback_);
       if (rv != net::ERR_IO_PENDING)
         OnCreateEntryComplete(NULL, rv);
       return;
     }
   } else if (creation_phase_ == DOOM_EXISTING) {
     creation_phase_ = SECOND_ATTEMPT;
-    entry_ptr = new(AppCacheDiskCacheInterface::Entry*);
+    AppCacheDiskCacheInterface::Entry** entry_ptr =
+        new AppCacheDiskCacheInterface::Entry*;
     create_callback_ =
         base::Bind(&AppCacheResponseWriter::OnCreateEntryComplete,
-                   base::Unretained(this), base::Owned(entry_ptr));
+                   weak_factory_.GetWeakPtr(), base::Owned(entry_ptr));
     rv = disk_cache_->CreateEntry(response_id_, entry_ptr, create_callback_);
     if (rv != net::ERR_IO_PENDING)
       OnCreateEntryComplete(entry_ptr, rv);
     return;
   }
 
   if (!create_callback_.is_null()) {
     if (rv == net::OK)
       entry_ = *entry;
 
     create_callback_.Reset();
   }
 
   if (info_buffer_)
     ContinueWriteInfo();
   else
     ContinueWriteData();
 }
 
 }  // namespace appcache