Get rid of DISALLOW_EVIL_CONSTRUCTORS macro usage in our code base.

gfx/icon_util_unittest.cc

 // 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.
 
 #include "base/scoped_ptr.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "gfx/gfx_paths.h"
 #include "gfx/icon_util.h"
 #include "gfx/size.h"
@@ skipping 31 matching lines @@
                                        height,
                                        LR_LOADTRANSPARENT | LR_LOADFROMFILE));
       return icon;
     }
 
    protected:
     // The root directory for test files.
     std::wstring test_data_directory_;
 
    private:
-    DISALLOW_EVIL_CONSTRUCTORS(IconUtilTest);
+    DISALLOW_COPY_AND_ASSIGN(IconUtilTest);
   };
 };
 
 // The following test case makes sure IconUtil::SkBitmapFromHICON fails
 // gracefully when called with invalid input parameters.
 TEST_F(IconUtilTest, TestIconToBitmapInvalidParameters) {
   std::wstring icon_filename(test_data_directory_);
   file_util::AppendToPath(&icon_filename, kSmallIconName);
   gfx::Size icon_size(kSmallIconWidth, kSmallIconHeight);
   HICON icon = LoadIconFromFile(icon_filename,
@@ skipping 188 matching lines @@
   // the .ico file we just created. We don't really check the additional icon
   // images created by IconUtil::CreateIconFileFromSkBitmap.
   HICON icon = LoadIconFromFile(icon_filename,
                                 kSmallIconWidth,
                                 kSmallIconHeight);
   EXPECT_NE(icon, static_cast<HICON>(NULL));
   if (icon != NULL) {
     ::DestroyIcon(icon);
   }
 }