Move the windows-specific scoped_* stuff from base to base/win and in the bas...

net/disk_cache/cache_util_win.cc

 // Copyright (c) 2006-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 "net/disk_cache/cache_util.h"
 
 #include <windows.h>
 
 #include "base/logging.h"
 #include "base/message_loop.h"
-#include "base/scoped_handle.h"
 #include "base/file_util.h"
 
 namespace {
 
 // Deletes all the files on path that match search_name pattern.
 void DeleteFiles(const wchar_t* path, const wchar_t* search_name) {
   std::wstring name(path);
   file_util::AppendToPath(&name, search_name);
 
   WIN32_FIND_DATA data;
-  ScopedFindFileHandle handle(FindFirstFile(name.c_str(), &data));
-  if (!handle.IsValid())
+  HANDLE handle = FindFirstFile(name.c_str(), &data);
+  if (handle == INVALID_HANDLE_VALUE)
     return;
 
   std::wstring adjusted_path(path);
   adjusted_path += L'\\';
   do {
     if (data.dwFileAttributes == FILE_ATTRIBUTE_DIRECTORY ||
         data.dwFileAttributes == FILE_ATTRIBUTE_REPARSE_POINT)
       continue;
     std::wstring current(adjusted_path);
     current += data.cFileName;
     DeleteFile(current.c_str());
   } while (FindNextFile(handle, &data));
+
+  FindClose(handle);
 }
 
 }  // namespace
 
 namespace disk_cache {
 
 bool MoveCache(const FilePath& from_path, const FilePath& to_path) {
   // I don't want to use the shell version of move because if something goes
   // wrong, that version will attempt to move file by file and fail at the end.
   if (!MoveFileEx(from_path.value().c_str(), to_path.value().c_str(), 0)) {
@@ skipping 23 matching lines @@
                                  OPEN_EXISTING, 0, NULL));
     if (file.IsValid())
       return false;
 
     // Most likely there is no file to open... and that's what we wanted.
   }
   return true;
 }
 
 }  // namespace disk_cache