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

base/win/scoped_variant_unittest.cc

Index: base/win/scoped_variant_unittest.cc
===================================================================
--- base/win/scoped_variant_unittest.cc	(revision 62694)
+++ base/win/scoped_variant_unittest.cc	(working copy)
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "base/scoped_variant_win.h"
+#include "base/win/scoped_variant.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
+namespace win {
+
 namespace {
 
 static const wchar_t kTestString1[] = L"Used to create BSTRs";
@@ -255,3 +258,6 @@
   EXPECT_EQ(sa, V_ARRAY(&var));
   // The array is destroyed in the destructor of var.
 }
+
+}  // namespace win
+}  // namespace base