Remove base/scoped_handle_win.h stub and fix up all callers to use the new location and namespace.

base/file_util_unittest.cc

-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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 "build/build_config.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <winioctl.h>
 #include <shellapi.h>
 #include <shlobj.h>
 #include <tchar.h>
 #endif
 
 #include <fstream>
 #include <set>
 
 #include "base/base_paths.h"
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
-#include "base/scoped_handle.h"
 #include "base/scoped_temp_dir.h"
 #include "base/threading/platform_thread.h"
 #include "base/time.h"
 #include "base/utf_string_conversions.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
+#if defined(OS_WIN)
+#include "base/win/scoped_handle.h"
+#endif
+
 // This macro helps avoid wrapped lines in the test structs.
 #define FPL(x) FILE_PATH_LITERAL(x)
 
 namespace {
 
 // To test that file_util::Normalize FilePath() deals with NTFS reparse points
 // correctly, we need functions to create and delete reparse points.
 #if defined(OS_WIN)
 typedef struct _REPARSE_DATA_BUFFER {
   ULONG  ReparseTag;
@@ skipping 424 matching lines @@
 
   FilePath sub_long = deep_file.DirName();
   ASSERT_TRUE(file_util::CreateDirectory(sub_long));
   CreateTextFile(deep_file, bogus_content);
 
   FilePath base_b = temp_dir_.path().Append(FPL("base_b"));
   ASSERT_TRUE(file_util::CreateDirectory(base_b));
 
   FilePath to_sub_a = base_b.Append(FPL("to_sub_a"));
   ASSERT_TRUE(file_util::CreateDirectory(to_sub_a));
-  ScopedHandle reparse_to_sub_a(
+  base::win::ScopedHandle reparse_to_sub_a(
       ::CreateFile(to_sub_a.value().c_str(),
                    FILE_ALL_ACCESS,
                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                    NULL,
                    OPEN_EXISTING,
                    FILE_FLAG_BACKUP_SEMANTICS,  // Needed to open a directory.
                    NULL));
   ASSERT_TRUE(reparse_to_sub_a.IsValid());
   ASSERT_TRUE(SetReparsePoint(reparse_to_sub_a, sub_a));
 
   FilePath to_base_b = base_b.Append(FPL("to_base_b"));
   ASSERT_TRUE(file_util::CreateDirectory(to_base_b));
-  ScopedHandle reparse_to_base_b(
+  base::win::ScopedHandle reparse_to_base_b(
       ::CreateFile(to_base_b.value().c_str(),
                    FILE_ALL_ACCESS,
                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                    NULL,
                    OPEN_EXISTING,
                    FILE_FLAG_BACKUP_SEMANTICS,  // Needed to open a directory.
                    NULL));
   ASSERT_TRUE(reparse_to_base_b.IsValid());
   ASSERT_TRUE(SetReparsePoint(reparse_to_base_b, base_b));
 
   FilePath to_sub_long = base_b.Append(FPL("to_sub_long"));
   ASSERT_TRUE(file_util::CreateDirectory(to_sub_long));
-  ScopedHandle reparse_to_sub_long(
+  base::win::ScopedHandle reparse_to_sub_long(
       ::CreateFile(to_sub_long.value().c_str(),
                    FILE_ALL_ACCESS,
                    FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE,
                    NULL,
                    OPEN_EXISTING,
                    FILE_FLAG_BACKUP_SEMANTICS,  // Needed to open a directory.
                    NULL));
   ASSERT_TRUE(reparse_to_sub_long.IsValid());
   ASSERT_TRUE(SetReparsePoint(reparse_to_sub_long, sub_long));
 
@@ skipping 1293 matching lines @@
   EXPECT_TRUE(file_util::IsDirectoryEmpty(empty_dir));
 
   FilePath foo(empty_dir.Append(FILE_PATH_LITERAL("foo.txt")));
   std::string bar("baz");
   ASSERT_TRUE(file_util::WriteFile(foo, bar.c_str(), bar.length()));
 
   EXPECT_FALSE(file_util::IsDirectoryEmpty(empty_dir));
 }
 
 }  // namespace