Revert 48186, 48196, 48198

gfx/icon_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// 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 "gfx/icon_util.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "base/scoped_handle.h"
 #include "base/scoped_ptr.h"
 #include "gfx/size.h"
@@ skipping 157 matching lines @@
 
   // Finding out whether the bitmap has an alpha channel.
   bool bitmap_has_alpha_channel = PixelsHaveAlpha(
       static_cast<const uint32*>(bitmap->getPixels()), num_pixels);
 
   // If the bitmap does not have an alpha channel, we need to build it using
   // the previously captured AND mask. Otherwise, we are done.
   if (!bitmap_has_alpha_channel) {
     unsigned int* p = static_cast<unsigned int*>(bitmap->getPixels());
     for (size_t i = 0; i < num_pixels; ++p, ++i) {
-      DCHECK_EQ((*p & 0xff000000), 0u);
+      DCHECK_EQ((*p & 0xff000000), 0);
       if (opaque[i])
         *p |= 0xff000000;
       else
         *p &= 0x00ffffff;
     }
   }
 
   delete [] opaque;
   ::DeleteDC(dib_dc);
   ::DeleteObject(dib);
@@ skipping 62 matching lines @@
                                   &icon_image_size);
     DCHECK_GT(icon_image_size, 0);
     offset += icon_image_size;
   }
   DCHECK_EQ(offset, buffer_size);
 
   // Finally, writing the data info the file.
   DWORD bytes_written;
   bool delete_file = false;
   if (!WriteFile(icon_file.Get(), buffer, buffer_size, &bytes_written, NULL) ||
-      static_cast<int>(bytes_written) != buffer_size) {
+      bytes_written != buffer_size) {
     delete_file = true;
   }
 
   ::CloseHandle(icon_file.Take());
   delete [] buffer;
   if (delete_file) {
     bool success = file_util::Delete(icon_file_name, false);
     DCHECK(success);
   }
 
@@ skipping 207 matching lines @@
   // Once we compute the size for a singe AND mask scan line, we multiply that
   // number by the image height in order to get the total number of bytes for
   // the AND mask. Thus, for a 15X15 image, we need 15 * 4 which is 60 bytes
   // for the monochrome bitmap representing the AND mask.
   int and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   *and_mask_size = and_line_length * bitmap.height();
   int masks_size = *xor_mask_size + *and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }