Replaces the windows function CreateDirectory with the CreateDirectory method...

chrome/installer/util/copy_tree_work_item_unittest.cc

 // Copyright (c) 2009 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 <iostream>
 
 #include "base/base_paths.h"
@@ skipping 82 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFile) {
   // Create source file
   FilePath file_name_from(test_dir_);
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_from));
 
   // Create destination path
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   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.ToWStringHack(),
                                        file_name_to.ToWStringHack(),
                                        temp_dir_.ToWStringHack(),
@@ skipping 18 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileOverwrite) {
   // Create source file
   FilePath file_name_from(test_dir_);
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_from));
 
   // Create destination file
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   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(file_util::PathExists(file_name_to));
 
   // test Do() with always_overwrite being true.
   scoped_ptr<CopyTreeWorkItem> work_item(
       WorkItem::CreateCopyTreeWorkItem(file_name_from.ToWStringHack(),
@@ skipping 47 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileSameContent) {
   // Create source file
   FilePath file_name_from(test_dir_);
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_from));
 
   // Create destination file
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   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(file_util::PathExists(file_name_to));
 
   // Get the path of backup file
   FilePath backup_file(temp_dir_);
   backup_file = backup_file.AppendASCII("File_To.txt");
@@ skipping 57 matching lines @@
 TEST_F(CopyTreeWorkItemTest, CopyFileAndCleanup) {
   // Create source file
   FilePath file_name_from(test_dir_);
   file_name_from = file_name_from.AppendASCII("File_From.txt");
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_from));
 
   // Create destination file
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   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(file_util::PathExists(file_name_to));
 
   // Get the path of backup file
   FilePath backup_file(temp_dir_);
   backup_file = backup_file.AppendASCII("File_To.txt");
@@ skipping 31 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::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);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   file_util::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(file_util::PathExists(file_name_to));
 
   LOG(INFO) << "copy ourself from "
             << exe_full_path.value() << " to " << file_name_to.value();
 
@@ skipping 56 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::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);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   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");
   file_util::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(file_util::PathExists(file_name_to));
 
   LOG(INFO) << "copy ourself from "
             << exe_full_path.value() << " to " << file_name_to.value();
@@ skipping 88 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::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);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
   FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   file_util::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(file_util::PathExists(file_name_to));
 
   // Get the path of backup file
   FilePath backup_file(temp_dir_);
   backup_file = backup_file.AppendASCII("File_To");
 
@@ skipping 57 matching lines @@
   CreateTextFile(file_name_from.value(), text_content_1);
   ASSERT_TRUE(file_util::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);
   FilePath exe_full_path(exe_full_path_str);
 
   FilePath dir_name_to(test_dir_);
   dir_name_to = dir_name_to.AppendASCII("Copy_To_Subdir");
-  CreateDirectory(dir_name_to.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_to);
   ASSERT_TRUE(file_util::PathExists(dir_name_to));
 
   FilePath file_name_to(dir_name_to);
   file_name_to = file_name_to.AppendASCII("File_To");
   file_util::CopyFile(exe_full_path, file_name_to);
   ASSERT_TRUE(file_util::PathExists(file_name_to));
 
   LOG(INFO) << "copy ourself from "
             << exe_full_path.value() << " to " << file_name_to.value();
 
@@ skipping 37 matching lines @@
   EXPECT_TRUE(WaitForSingleObject(pi.hProcess, 10000) == WAIT_OBJECT_0);
   CloseHandle(pi.hProcess);
   CloseHandle(pi.hThread);
 }
 
 // Copy a tree from source to destination.
 TEST_F(CopyTreeWorkItemTest, CopyTree) {
   // Create source tree
   FilePath dir_name_from(test_dir_);
   dir_name_from = dir_name_from.AppendASCII("from");
-  CreateDirectory(dir_name_from.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_from);
   ASSERT_TRUE(file_util::PathExists(dir_name_from));
 
   FilePath dir_name_from_1(dir_name_from);
   dir_name_from_1 = dir_name_from_1.AppendASCII("1");
-  CreateDirectory(dir_name_from_1.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_from_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_from_1));
 
   FilePath dir_name_from_2(dir_name_from);
   dir_name_from_2 = dir_name_from_2.AppendASCII("2");
-  CreateDirectory(dir_name_from_2.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_from_2);
   ASSERT_TRUE(file_util::PathExists(dir_name_from_2));
 
   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(file_util::PathExists(file_name_from_1));
 
   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 22 matching lines @@
   EXPECT_TRUE(file_util::ContentsEqual(file_name_from_1, file_name_to_1));
 
   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(file_util::PathExists(file_name_to_2));
   LOG(INFO) << "compare "
             << file_name_from_2.value() << " and " << file_name_to_2.value();
   EXPECT_TRUE(file_util::ContentsEqual(file_name_from_2, file_name_to_2));
 }