Disk Cache: cleanup of OpenBlockFile....

net/disk_cache/block_files.cc

 // Copyright (c) 2006-2008 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 "net/disk_cache/block_files.h"
 
 #include "base/file_util.h"
 #include "base/histogram.h"
 #include "base/string_util.h"
 #include "base/time.h"
@@ skipping 219 matching lines @@
 }
 
 bool BlockFiles::OpenBlockFile(int index) {
   if (block_files_.size() - 1 < static_cast<unsigned int>(index)) {
     DCHECK(index > 0);
     int to_add = index - static_cast<int>(block_files_.size()) + 1;
     block_files_.resize(block_files_.size() + to_add);
   }
 
   std::wstring name = Name(index);
-  MappedFile* file = new MappedFile();
-  file->AddRef();
+  scoped_refptr<MappedFile> file(new MappedFile());
 
   if (!file->Init(name, kBlockHeaderSize)) {
-    NOTREACHED();
     LOG(ERROR) << "Failed to open " << name;
-    file->Release();
     return false;
   }
 
   if (file->GetLength() < static_cast<size_t>(kBlockHeaderSize)) {
     LOG(ERROR) << "File too small " << name;
-    file->Release();
     return false;
   }
 
-  block_files_[index] = file;
-
   BlockFileHeader* header = reinterpret_cast<BlockFileHeader*>(file->buffer());
   if (kBlockMagic != header->magic || kCurrentVersion != header->version) {
     LOG(ERROR) << "Invalid file version or magic";
     return false;
   }
 
   if (header->updating) {
     // Last instance was not properly shutdown.
     if (!FixBlockFileHeader(file))
       return false;
   }
+
+  DCHECK(!block_files_[index]);
+  file.swap(&block_files_[index]);
   return true;
 }
 
 MappedFile* BlockFiles::GetFile(Addr address) {
   DCHECK(block_files_.size() >= 4);
   DCHECK(address.is_block_file() || !address.is_initialized());
   if (!address.is_initialized())
     return NULL;
 
   int file_index = address.FileNumber();
@@ skipping 206 matching lines @@
     int num_entries = (file_size - sizeof(*header)) / header->entry_size;
     header->max_entries = num_entries;
   }
 
   FixAllocationCounters(header);
   header->updating = 0;
   return true;
 }
 
 }  // namespace disk_cache