Rewrite scoped_ptr<T>(NULL) to use the default ctor in net/.

net/disk_cache/simple/simple_index_file.cc

 // Copyright (c) 2013 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/simple/simple_index_file.h"
 
 #include "base/file_util.h"
 #include "base/files/file_enumerator.h"
 #include "base/hash.h"
 #include "base/logging.h"
@@ skipping 155 matching lines @@
   // If not true, we need to restore the index.
   return index_mtime < dir_mtime;
 }
 
 // static
 scoped_ptr<SimpleIndex::EntrySet> SimpleIndexFile::LoadFromDisk(
     const base::FilePath& index_filename) {
   std::string contents;
   if(!file_util::ReadFileToString(index_filename, &contents)) {
     LOG(WARNING) << "Could not read Simple Index file.";
-    return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+    return scoped_ptr<SimpleIndex::EntrySet>();
   }
 
   return SimpleIndexFile::Deserialize(contents.data(), contents.size());
 }
 
 // static
 scoped_ptr<SimpleIndex::EntrySet> SimpleIndexFile::Deserialize(const char* data,
                                                                int data_len) {
   DCHECK(data);
   Pickle pickle(data, data_len);
   if (!pickle.data()) {
     LOG(WARNING) << "Corrupt Simple Index File.";
-    return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+    return scoped_ptr<SimpleIndex::EntrySet>();
   }
 
   PickleIterator pickle_it(pickle);
 
   SimpleIndexFile::PickleHeader* header_p =
       pickle.headerT<SimpleIndexFile::PickleHeader>();
   const uint32 crc_read = header_p->crc;
   const uint32 crc_calculated = CalculatePickleCRC(pickle);
 
   if (crc_read != crc_calculated) {
     LOG(WARNING) << "Invalid CRC in Simple Index file.";
-    return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+    return scoped_ptr<SimpleIndex::EntrySet>();
   }
 
   SimpleIndexFile::IndexMetadata index_metadata;
   if (!index_metadata.Deserialize(&pickle_it)) {
     LOG(ERROR) << "Invalid index_metadata on Simple Cache Index.";
-    return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+    return scoped_ptr<SimpleIndex::EntrySet>();
   }
 
   if (!index_metadata.CheckIndexMetadata()) {
     LOG(ERROR) << "Invalid index_metadata on Simple Cache Index.";
-    return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+    return scoped_ptr<SimpleIndex::EntrySet>();
   }
 
   scoped_ptr<SimpleIndex::EntrySet> index_file_entries(
       new SimpleIndex::EntrySet());
   while (index_file_entries->size() < index_metadata.GetNumberOfEntries()) {
     uint64 hash_key;
     EntryMetadata entry_metadata;
     if (!pickle_it.ReadUInt64(&hash_key) ||
         !entry_metadata.Deserialize(&pickle_it)) {
       LOG(WARNING) << "Invalid EntryMetadata in Simple Index file.";
-      return scoped_ptr<SimpleIndex::EntrySet>(NULL);
+      return scoped_ptr<SimpleIndex::EntrySet>();
     }
     SimpleIndex::InsertInEntrySet(
         hash_key, entry_metadata, index_file_entries.get());
   }
 
   return index_file_entries.Pass();
 }
 
 // static
 scoped_ptr<Pickle> SimpleIndexFile::Serialize(
@@ skipping 133 matching lines @@
           index_file_entries.get());
     } else {
       // Summing up the total size of the entry through all the *_[0-2] files
       it->second.SetEntrySize(it->second.GetEntrySize() + file_size);
     }
   }
   return index_file_entries.Pass();
 }
 
 }  // namespace disk_cache