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

base/win/scoped_handle.h

Index: base/win/scoped_handle.h
===================================================================
--- base/win/scoped_handle.h	(revision 62694)
+++ base/win/scoped_handle.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_SCOPED_HANDLE_WIN_H_
-#define BASE_SCOPED_HANDLE_WIN_H_
+#ifndef BASE_WIN_SCOPED_HANDLE_H_
+#define BASE_WIN_SCOPED_HANDLE_H_
 #pragma once
 
 #include <windows.h>
@@ -11,6 +11,9 @@
 #include "base/basictypes.h"
 #include "base/logging.h"
 
+namespace base {
+namespace win {
+
 // Used so we always remember to close the handle.
 // The class interface matches that of ScopedStdioHandle in  addition to an
 // IsValid() method since invalid handles on windows can be either NULL or
@@ -81,158 +84,7 @@
   DISALLOW_COPY_AND_ASSIGN(ScopedHandle);
 };
 
-// Like ScopedHandle, but for HANDLEs returned from FindFile().
-class ScopedFindFileHandle {
- public:
-  explicit ScopedFindFileHandle(HANDLE handle) : handle_(handle) {
-    // Windows is inconsistent about invalid handles, so we always use NULL
-    if (handle_ == INVALID_HANDLE_VALUE)
-      handle_ = NULL;
-  }
+}  // namespace win
+}  // namespace base
 
-  ~ScopedFindFileHandle() {
-    if (handle_)
-      FindClose(handle_);
-  }
-
-  // Use this instead of comparing to INVALID_HANDLE_VALUE to pick up our NULL
-  // usage for errors.
-  bool IsValid() const { return handle_ != NULL; }
-
-  operator HANDLE() { return handle_; }
-
- private:
-  HANDLE handle_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedFindFileHandle);
-};
-
-// Like ScopedHandle but for HDC.  Only use this on HDCs returned from
-// CreateCompatibleDC.  For an HDC returned by GetDC, use ReleaseDC instead.
-class ScopedHDC {
- public:
-  ScopedHDC() : hdc_(NULL) { }
-  explicit ScopedHDC(HDC h) : hdc_(h) { }
-
-  ~ScopedHDC() {
-    Close();
-  }
-
-  HDC Get() {
-    return hdc_;
-  }
-
-  void Set(HDC h) {
-    Close();
-    hdc_ = h;
-  }
-
-  operator HDC() { return hdc_; }
-
- private:
-  void Close() {
-#ifdef NOGDI
-    assert(false);
-#else
-    if (hdc_)
-      DeleteDC(hdc_);
-#endif  // NOGDI
-  }
-
-  HDC hdc_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedHDC);
-};
-
-// Like ScopedHandle but for GDI objects.
-template<class T>
-class ScopedGDIObject {
- public:
-  ScopedGDIObject() : object_(NULL) {}
-  explicit ScopedGDIObject(T object) : object_(object) {}
-
-  ~ScopedGDIObject() {
-    Close();
-  }
-
-  T Get() {
-    return object_;
-  }
-
-  void Set(T object) {
-    if (object_ && object != object_)
-      Close();
-    object_ = object;
-  }
-
-  ScopedGDIObject& operator=(T object) {
-    Set(object);
-    return *this;
-  }
-
-  T release() {
-    T object = object_;
-    object_ = NULL;
-    return object;
-  }
-
-  operator T() { return object_; }
-
- private:
-  void Close() {
-    if (object_)
-      DeleteObject(object_);
-  }
-
-  T object_;
-  DISALLOW_COPY_AND_ASSIGN(ScopedGDIObject);
-};
-
-// An explicit specialization for HICON because we have to call DestroyIcon()
-// instead of DeleteObject() for HICON.
-template<>
-void ScopedGDIObject<HICON>::Close() {
-  if (object_)
-    DestroyIcon(object_);
-}
-
-// Typedefs for some common use cases.
-typedef ScopedGDIObject<HBITMAP> ScopedBitmap;
-typedef ScopedGDIObject<HRGN> ScopedRegion;
-typedef ScopedGDIObject<HFONT> ScopedHFONT;
-typedef ScopedGDIObject<HICON> ScopedHICON;
-
-// Like ScopedHandle except for HGLOBAL.
-template<class T>
-class ScopedHGlobal {
- public:
-  explicit ScopedHGlobal(HGLOBAL glob) : glob_(glob) {
-    data_ = static_cast<T*>(GlobalLock(glob_));
-  }
-  ~ScopedHGlobal() {
-    GlobalUnlock(glob_);
-  }
-
-  T* get() { return data_; }
-
-  size_t Size() const { return GlobalSize(glob_); }
-
-  T* operator->() const  {
-    assert(data_ != 0);
-    return data_;
-  }
-
-  T* release() {
-    T* data = data_;
-    data_ = NULL;
-    return data;
-  }
-
- private:
-  HGLOBAL glob_;
-
-  T* data_;
-
-  DISALLOW_COPY_AND_ASSIGN(ScopedHGlobal);
-};
-
 #endif  // BASE_SCOPED_HANDLE_WIN_H_