Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace.

gfx/icon_util.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "base/win/scoped_handle.h"
 #include "gfx/size.h"
 #include "skia/ext/image_operations.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 
 // Defining the dimensions for the icon images. We store only one value because
 // we always resize to a square image; that is, the value 48 means that we are
 // going to resize the given bitmap to a 48 by 48 pixels bitmap.
 //
 // The icon images appear in the icon file in same order in which their
 // corresponding dimensions appear in the |icon_dimensions_| array, so it is
@@ skipping 169 matching lines @@
                                           const FilePath& icon_path) {
   // Only 32 bit ARGB bitmaps are supported. We also make sure the bitmap has
   // been properly initialized.
   SkAutoLockPixels bitmap_lock(bitmap);
   if ((bitmap.getConfig() != SkBitmap::kARGB_8888_Config) ||
       (bitmap.height() <= 0) || (bitmap.width() <= 0) ||
       (bitmap.getPixels() == NULL))
     return false;
 
   // We start by creating the file.
-  ScopedHandle icon_file(::CreateFile(icon_path.value().c_str(),
+  base::win::ScopedHandle icon_file(::CreateFile(icon_path.value().c_str(),
        GENERIC_WRITE, 0, NULL, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL));
 
   if (icon_file.Get() == INVALID_HANDLE_VALUE)
     return false;
 
   // Creating a set of bitmaps corresponding to the icon images we'll end up
   // storing in the icon file. Each bitmap is created by resizing the given
   // bitmap to the desired size.
   std::vector<SkBitmap> bitmaps;
   CreateResizedBitmapSet(bitmap, &bitmaps);
@@ skipping 237 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.
   size_t and_line_length = (bitmap.width() + 7) >> 3;
   and_line_length = (and_line_length + 3) & ~3;
   size_t and_mask_size = and_line_length * bitmap.height();
   size_t masks_size = *xor_mask_size + and_mask_size;
   *bytes_in_resource = masks_size + sizeof(BITMAPINFOHEADER);
 }