Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.

net/disk_cache/storage_block.h

-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 // See net/disk_cache/disk_cache.h for the public interface.
 
 #ifndef NET_DISK_CACHE_STORAGE_BLOCK_H__
 #define NET_DISK_CACHE_STORAGE_BLOCK_H__
 
 #include "net/disk_cache/addr.h"
 #include "net/disk_cache/mapped_file.h"
@@ skipping 63 matching lines @@
   void AllocateData();
   void DeleteData();
 
   T* data_;
   MappedFile* file_;
   Addr address_;
   bool modified_;
   bool own_data_;  // Is data_ owned by this object or shared with someone else.
   bool extended_;  // Used to store an entry of more than one block.
 
-  DISALLOW_EVIL_CONSTRUCTORS(StorageBlock);
+  DISALLOW_COPY_AND_ASSIGN(StorageBlock);
 };
 
 typedef StorageBlock<EntryStore> CacheEntryBlock;
 typedef StorageBlock<RankingsNode> CacheRankingsBlock;
 
 }  // namespace disk_cache
 
 #endif  // NET_DISK_CACHE_STORAGE_BLOCK_H__