Move directory creation functions to base namespace.

chrome/installer/util/copy_tree_work_item_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/file_util.h"
@@ skipping 66 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFile) {
   // Create source file
   base::FilePath file_name_from(test_dir_.path());
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create destination path
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To.txt");
 
   // test Do()
   scoped_ptr<CopyTreeWorkItem> work_item(
       WorkItem::CreateCopyTreeWorkItem(file_name_from,
                                        file_name_to,
                                        temp_dir_.path(),
@@ skipping 19 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileOverwrite) {
   // Create source file
   base::FilePath file_name_from(test_dir_.path());
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create destination file
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To.txt");
   CreateTextFile(file_name_to.value(), text_content_2);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   // test Do() with always_overwrite being true.
   scoped_ptr<CopyTreeWorkItem> work_item(
       WorkItem::CreateCopyTreeWorkItem(file_name_from,
@@ skipping 49 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileSameContent) {
   // Create source file
   base::FilePath file_name_from(test_dir_.path());
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create destination file
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To.txt");
   CreateTextFile(file_name_to.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   // test Do() with always_overwrite being true.
   scoped_ptr<CopyTreeWorkItem> work_item(
       WorkItem::CreateCopyTreeWorkItem(file_name_from,
@@ skipping 60 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileAndCleanup) {
   // Create source file
   base::FilePath file_name_from(test_dir_.path());
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create destination file
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To.txt");
   CreateTextFile(file_name_to.value(), text_content_2);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   base::FilePath backup_file;
 
   {
@@ skipping 35 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create an executable in destination path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   ::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
   base::FilePath exe_full_path(exe_full_path_str);
 
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   base::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   VLOG(1) << "copy ourself from " << exe_full_path.value()
           << " to " << file_name_to.value();
 
@@ skipping 58 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create an executable in destination path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   ::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
   base::FilePath exe_full_path(exe_full_path_str);
 
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to), alternate_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   alternate_to = alternate_to.AppendASCII("Alternate_To");
   base::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   VLOG(1) << "copy ourself from " << exe_full_path.value()
           << " to " << file_name_to.value();
@@ skipping 90 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create an executable in destination path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   ::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
   base::FilePath exe_full_path(exe_full_path_str);
 
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   base::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   // Get the path of backup file
   base::FilePath backup_file(temp_dir_.path());
   backup_file = backup_file.AppendASCII("File_To");
 
@@ skipping 61 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from));
 
   // Create an executable in destination path by copying ourself to it.
   wchar_t exe_full_path_str[MAX_PATH];
   ::GetModuleFileName(NULL, exe_full_path_str, MAX_PATH);
   base::FilePath exe_full_path(exe_full_path_str);
 
   base::FilePath dir_name_to(test_dir_.path());
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  file_util::CreateDirectory(dir_name_to);
+  base::CreateDirectory(dir_name_to);
   ASSERT_TRUE(base::PathExists(dir_name_to));
 
   base::FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   base::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(base::PathExists(file_name_to));
 
   VLOG(1) << "copy ourself from " << exe_full_path.value()
           << " to " << file_name_to.value();
 
@@ skipping 42 matching lines @@
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 }
 
 // Copy a tree from source to destination.
 // Flaky, http://crbug.com/59784.
 TEST_F(CopyTreeWorkItemTest, DISABLED_CopyTree) {
   // Create source tree
   base::FilePath dir_name_from(test_dir_.path());
   dir_name_from = dir_name_from.AppendASCII("from");
-  file_util::CreateDirectory(dir_name_from);
+  base::CreateDirectory(dir_name_from);
   ASSERT_TRUE(base::PathExists(dir_name_from));
 
   base::FilePath dir_name_from_1(dir_name_from);
   dir_name_from_1 = dir_name_from_1.AppendASCII("1");
-  file_util::CreateDirectory(dir_name_from_1);
+  base::CreateDirectory(dir_name_from_1);
   ASSERT_TRUE(base::PathExists(dir_name_from_1));
 
   base::FilePath dir_name_from_2(dir_name_from);
   dir_name_from_2 = dir_name_from_2.AppendASCII("2");
-  file_util::CreateDirectory(dir_name_from_2);
+  base::CreateDirectory(dir_name_from_2);
   ASSERT_TRUE(base::PathExists(dir_name_from_2));
 
   base::FilePath file_name_from_1(dir_name_from_1);
   file_name_from_1 = file_name_from_1.AppendASCII("File_1.txt");
   CreateTextFile(file_name_from_1.value(), text_content_1);
   ASSERT_TRUE(base::PathExists(file_name_from_1));
 
   base::FilePath file_name_from_2(dir_name_from_2);
   file_name_from_2 = file_name_from_2.AppendASCII("File_2.txt");
   CreateTextFile(file_name_from_2.value(), text_content_1);
@@ skipping 23 matching lines @@
   EXPECT_TRUE(base::ContentsEqual(file_name_from_1, file_name_to_1));
 
   base::FilePath file_name_to_2(dir_name_to);
   file_name_to_2 = file_name_to_2.AppendASCII("2");
   file_name_to_2 = file_name_to_2.AppendASCII("File_2.txt");
   EXPECT_TRUE(base::PathExists(file_name_to_2));
   VLOG(1) << "compare " << file_name_from_2.value()
           << " and " << file_name_to_2.value();
   EXPECT_TRUE(base::ContentsEqual(file_name_from_2, file_name_to_2));
 }