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

base/win/scoped_variant.h

Index: base/win/scoped_variant.h
===================================================================
--- base/win/scoped_variant.h	(revision 62694)
+++ base/win/scoped_variant.h	(working copy)
@@ -2,16 +2,18 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef BASE_SCOPED_VARIANT_WIN_H_
-#define BASE_SCOPED_VARIANT_WIN_H_
+#ifndef BASE_WIN_SCOPED_VARIANT_H_
+#define BASE_WIN_SCOPED_VARIANT_H_
 #pragma once
 
 #include <windows.h>
 #include <oleauto.h>
 
 #include "base/basictypes.h"
-#include "build/build_config.h"
 
+namespace base {
+namespace win {
+
 // Scoped VARIANT class for automatically freeing a COM VARIANT at the
 // end of a scope.  Additionally provides a few functions to make the
 // encapsulated VARIANT easier to use.
@@ -158,4 +160,7 @@
   DISALLOW_COPY_AND_ASSIGN(ScopedVariant);
 };
 
-#endif  // BASE_SCOPED_VARIANT_WIN_H_
+}  // namespace win
+}  // namesoace base
+
+#endif  // BASE_WIN_SCOPED_VARIANT_H_