Move scoped_temp_dir from base to base/files

chrome/installer/util/self_cleaning_temp_dir_unittest.cc

 // 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 <windows.h>
 #include <wincrypt.h>
 
 #include "base/file_util.h"
-#include "base/scoped_temp_dir.h"
+#include "base/files/scoped_temp_dir.h"
 #include "base/string_number_conversions.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/installer/util/self_cleaning_temp_dir.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 // Returns a string of 8 characters consisting of the letter 'R' followed by
 // seven random hex digits.
 std::wstring GetRandomFilename() {
@@ skipping 39 matching lines @@
   FilePath parent_dir(L"C:\\");
   parent_dir = parent_dir.Append(GetRandomFilename());
   SelfCleaningTempDir::GetTopDirToCreate(parent_dir, &base_dir);
   EXPECT_EQ(parent_dir, base_dir);
 }
 
 // Test that all intermediate dirs are cleaned up if they're empty when
 // Delete() is called.
 TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDelete) {
   // Make a directory in which we'll work.
-  ScopedTempDir work_dir;
+  base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
   FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
   SelfCleaningTempDir temp_dir;
   EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
   EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
   EXPECT_TRUE(file_util::DirectoryExists(temp_dir.path()));
   EXPECT_TRUE(temp_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir));
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName()));
   EXPECT_TRUE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 // Test that two clients can work in the same area.
 TEST_F(SelfCleaningTempDirTest, TwoClients) {
   // Make a directory in which we'll work.
-  ScopedTempDir work_dir;
+  base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
   FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
   SelfCleaningTempDir temp_dir1;
   SelfCleaningTempDir temp_dir2;
   // First client is created.
   EXPECT_TRUE(temp_dir1.Initialize(parent_temp_dir, L"Three"));
   // Second client is created in the same space.
   EXPECT_TRUE(temp_dir2.Initialize(parent_temp_dir, L"Three"));
@@ skipping 16 matching lines @@
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName()));
   EXPECT_TRUE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 // Test that all intermediate dirs are cleaned up if they're empty when the
 // destructor is called.
 TEST_F(SelfCleaningTempDirTest, RemoveUnusedOnDestroy) {
   // Make a directory in which we'll work.
-  ScopedTempDir work_dir;
+  base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
   FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
   {
     SelfCleaningTempDir temp_dir;
     EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
     EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
     EXPECT_TRUE(file_util::DirectoryExists(temp_dir.path()));
   }
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir));
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName()));
   EXPECT_TRUE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 // Test that intermediate dirs are left behind if they're not empty when the
 // destructor is called.
 TEST_F(SelfCleaningTempDirTest, LeaveUsedOnDestroy) {
   static const char kHiHon[] = "hi, hon";
 
   // Make a directory in which we'll work.
-  ScopedTempDir work_dir;
+  base::ScopedTempDir work_dir;
   EXPECT_TRUE(work_dir.CreateUniqueTempDir());
 
   // Make up some path under the temp dir.
   FilePath parent_temp_dir(work_dir.path().Append(L"One").Append(L"Two"));
   {
     SelfCleaningTempDir temp_dir;
     EXPECT_TRUE(temp_dir.Initialize(parent_temp_dir, L"Three"));
     EXPECT_EQ(parent_temp_dir.Append(L"Three"), temp_dir.path());
     EXPECT_TRUE(file_util::DirectoryExists(temp_dir.path()));
     // Drop a file somewhere.
     EXPECT_EQ(arraysize(kHiHon) - 1,
               file_util::WriteFile(parent_temp_dir.Append(GetRandomFilename()),
                                    kHiHon, arraysize(kHiHon) - 1));
   }
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.Append(L"Three")));
   EXPECT_TRUE(file_util::DirectoryExists(parent_temp_dir));
   EXPECT_TRUE(work_dir.Delete());
   EXPECT_FALSE(file_util::DirectoryExists(parent_temp_dir.DirName().DirName()));
 }
 
 }  // namespace installer