Move directory creation functions to base namespace.

chrome/installer/util/installer_state_unittest.cc

 // Copyright (c) 2012 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 <fstream>
 
 #include "base/base_paths.h"
 #include "base/command_line.h"
@@ skipping 79 matching lines @@
 wchar_t text_content_1[] = L"delete me";
 wchar_t text_content_2[] = L"delete me as well";
 
 // Delete version directories. Everything lower than the given version
 // should be deleted.
 TEST_F(InstallerStateTest, Delete) {
   // TODO(grt): move common stuff into the test fixture.
   // Create a Chrome dir
   base::FilePath chrome_dir(test_dir_.path());
   chrome_dir = chrome_dir.AppendASCII("chrome");
-  file_util::CreateDirectory(chrome_dir);
+  base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
 
   base::FilePath chrome_dir_1(chrome_dir);
   chrome_dir_1 = chrome_dir_1.AppendASCII("1.0.1.0");
-  file_util::CreateDirectory(chrome_dir_1);
+  base::CreateDirectory(chrome_dir_1);
   ASSERT_TRUE(base::PathExists(chrome_dir_1));
 
   base::FilePath chrome_dir_2(chrome_dir);
   chrome_dir_2 = chrome_dir_2.AppendASCII("1.0.2.0");
-  file_util::CreateDirectory(chrome_dir_2);
+  base::CreateDirectory(chrome_dir_2);
   ASSERT_TRUE(base::PathExists(chrome_dir_2));
 
   base::FilePath chrome_dir_3(chrome_dir);
   chrome_dir_3 = chrome_dir_3.AppendASCII("1.0.3.0");
-  file_util::CreateDirectory(chrome_dir_3);
+  base::CreateDirectory(chrome_dir_3);
   ASSERT_TRUE(base::PathExists(chrome_dir_3));
 
   base::FilePath chrome_dir_4(chrome_dir);
   chrome_dir_4 = chrome_dir_4.AppendASCII("1.0.4.0");
-  file_util::CreateDirectory(chrome_dir_4);
+  base::CreateDirectory(chrome_dir_4);
   ASSERT_TRUE(base::PathExists(chrome_dir_4));
 
   base::FilePath chrome_dll_1(chrome_dir_1);
   chrome_dll_1 = chrome_dll_1.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_1.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(chrome_dll_1));
 
   base::FilePath chrome_dll_2(chrome_dir_2);
   chrome_dll_2 = chrome_dll_2.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_2.value(), text_content_1);
@@ skipping 25 matching lines @@
   EXPECT_FALSE(base::PathExists(chrome_dir_3));
   // the latest version should stay
   EXPECT_TRUE(base::PathExists(chrome_dll_4));
 }
 
 // Delete older version directories, keeping the one in used intact.
 TEST_F(InstallerStateTest, DeleteInUsed) {
   // Create a Chrome dir
   base::FilePath chrome_dir(test_dir_.path());
   chrome_dir = chrome_dir.AppendASCII("chrome");
-  file_util::CreateDirectory(chrome_dir);
+  base::CreateDirectory(chrome_dir);
   ASSERT_TRUE(base::PathExists(chrome_dir));
 
   base::FilePath chrome_dir_1(chrome_dir);
   chrome_dir_1 = chrome_dir_1.AppendASCII("1.0.1.0");
-  file_util::CreateDirectory(chrome_dir_1);
+  base::CreateDirectory(chrome_dir_1);
   ASSERT_TRUE(base::PathExists(chrome_dir_1));
 
   base::FilePath chrome_dir_2(chrome_dir);
   chrome_dir_2 = chrome_dir_2.AppendASCII("1.0.2.0");
-  file_util::CreateDirectory(chrome_dir_2);
+  base::CreateDirectory(chrome_dir_2);
   ASSERT_TRUE(base::PathExists(chrome_dir_2));
 
   base::FilePath chrome_dir_3(chrome_dir);
   chrome_dir_3 = chrome_dir_3.AppendASCII("1.0.3.0");
-  file_util::CreateDirectory(chrome_dir_3);
+  base::CreateDirectory(chrome_dir_3);
   ASSERT_TRUE(base::PathExists(chrome_dir_3));
 
   base::FilePath chrome_dir_4(chrome_dir);
   chrome_dir_4 = chrome_dir_4.AppendASCII("1.0.4.0");
-  file_util::CreateDirectory(chrome_dir_4);
+  base::CreateDirectory(chrome_dir_4);
   ASSERT_TRUE(base::PathExists(chrome_dir_4));
 
   base::FilePath chrome_dll_1(chrome_dir_1);
   chrome_dll_1 = chrome_dll_1.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_1.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(chrome_dll_1));
 
   base::FilePath chrome_dll_2(chrome_dir_2);
   chrome_dll_2 = chrome_dll_2.AppendASCII("chrome.dll");
   CreateTextFile(chrome_dll_2.value(), text_content_1);
@@ skipping 80 matching lines @@
 
   base::FilePath new_version_dir(installer_state.target_path().Append(
       UTF8ToWide(new_version.GetString())));
   base::FilePath old_version_dir(installer_state.target_path().Append(
       UTF8ToWide(old_version.GetString())));
 
   EXPECT_FALSE(base::PathExists(new_version_dir));
   EXPECT_FALSE(base::PathExists(old_version_dir));
 
   EXPECT_FALSE(base::PathExists(installer_dir));
-  file_util::CreateDirectory(installer_dir);
+  base::CreateDirectory(installer_dir);
   EXPECT_TRUE(base::PathExists(new_version_dir));
 
-  file_util::CreateDirectory(old_version_dir);
+  base::CreateDirectory(old_version_dir);
   EXPECT_TRUE(base::PathExists(old_version_dir));
 
   // Create a fake chrome.dll key file in the old version directory.  This
   // should prevent the old version directory from getting deleted.
   base::FilePath old_chrome_dll(old_version_dir.Append(installer::kChromeDll));
   EXPECT_FALSE(base::PathExists(old_chrome_dll));
 
   // Hold on to the file exclusively to prevent the directory from
   // being deleted.
   base::win::ScopedHandle file(
@@ skipping 226 matching lines @@
     installer_state.target_path().Append(ASCIIToWide(kOldVersion)),
     installer_state.target_path().Append(ASCIIToWide(kOldChromeExeVersion)),
     installer_state.target_path().Append(L"2.1.1.0"),
     installer_state.target_path().Append(ASCIIToWide(kChromeExeVersion)),
     installer_state.target_path().Append(ASCIIToWide(kNewVersion)),
     installer_state.target_path().Append(L"3.9.1.1"),
   };
 
   // Create the version directories.
   for (int i = 0; i < arraysize(version_dirs); i++) {
-    file_util::CreateDirectory(version_dirs[i]);
+    base::CreateDirectory(version_dirs[i]);
     EXPECT_TRUE(base::PathExists(version_dirs[i]));
   }
 
   // Create exes with the appropriate version resource.
   // Use the current test exe as a baseline.
   base::FilePath exe_path;
   ASSERT_TRUE(PathService::Get(base::FILE_EXE, &exe_path));
 
   struct target_info {
     base::FilePath target_file;
@@ skipping 200 matching lines @@
   // Critical update newer than the new version.
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(NULL, *pv_version_).IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(opv_version_, *pv_version_)
           .IsValid());
   EXPECT_FALSE(
       installer_state.DetermineCriticalVersion(pv_version_, *pv_version_)
           .IsValid());
 }