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

base/win/scoped_comptr_unittest.cc

 // Copyright (c) 2006-2008 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 "base/scoped_comptr_win.h"
+#include "base/win/scoped_comptr.h"
 
 #include <shlobj.h>
 
 #include "base/scoped_ptr.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
+namespace base {
+namespace win {
+
 namespace {
 
 struct Dummy {
   Dummy() : adds(0), releases(0) { }
   void AddRef() { ++adds; }
   void Release() { ++releases; }
 
   int adds;
   int releases;
 };
@@ skipping 76 matching lines @@
     EXPECT_EQ(p->adds, 4);
     EXPECT_EQ(p->releases, 1);
     EXPECT_EQ(bleh[0], p.get());
     bleh.pop_back();
     EXPECT_EQ(p->adds, 4);
     EXPECT_EQ(p->releases, 2);
   }
   EXPECT_EQ(p->adds, 4);
   EXPECT_EQ(p->releases, 4);
 }
+
+}  // namespace win
+}  // namespace base