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

chrome/installer/util/delete_tree_work_item_unittest.cc

 // Copyright (c) 2006-2008 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 44 matching lines @@
 
   wchar_t text_content_1[] = L"delete me";
   wchar_t text_content_2[] = L"delete me as well";
 };
 
 // Delete a tree without key path. Everything should be deleted.
 TEST_F(DeleteTreeWorkItemTest, DeleteTreeNoKeyPath) {
   // Create tree to be deleted
   FilePath dir_name_delete(test_dir_);
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
-  CreateDirectory(dir_name_delete.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
-  CreateDirectory(dir_name_delete_1.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
   dir_name_delete_2 = dir_name_delete_2.AppendASCII("2");
-  CreateDirectory(dir_name_delete_2.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_2);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_2));
 
   FilePath file_name_delete_1(dir_name_delete_1);
   file_name_delete_1 = file_name_delete_1.AppendASCII("File_1.txt");
   CreateTextFile(file_name_delete_1.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_delete_1));
 
   FilePath file_name_delete_2(dir_name_delete_2);
   file_name_delete_2 = file_name_delete_2.AppendASCII("File_2.txt");
   CreateTextFile(file_name_delete_2.value(), text_content_1);
@@ skipping 17 matching lines @@
   EXPECT_TRUE(file_util::PathExists(dir_name_delete));
 }
 
 
 // Delete a tree with keypath but not in use. Everything should be gone.
 // Rollback should bring back everything
 TEST_F(DeleteTreeWorkItemTest, DeleteTree) {
   // Create tree to be deleted
   FilePath dir_name_delete(test_dir_);
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
-  CreateDirectory(dir_name_delete.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
-  CreateDirectory(dir_name_delete_1.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
   dir_name_delete_2 = dir_name_delete_2.AppendASCII("2");
-  CreateDirectory(dir_name_delete_2.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_2);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_2));
 
   FilePath file_name_delete_1(dir_name_delete_1);
   file_name_delete_1 = file_name_delete_1.AppendASCII("File_1.txt");
   CreateTextFile(file_name_delete_1.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_delete_1));
 
   FilePath file_name_delete_2(dir_name_delete_2);
   file_name_delete_2 = file_name_delete_2.AppendASCII("File_2.txt");
   CreateTextFile(file_name_delete_2.value(), text_content_1);
@@ skipping 15 matching lines @@
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
   EXPECT_TRUE(file_util::PathExists(dir_name_delete));
 }
 
 // Delete a tree with key_path in use. Everything should still be there.
 TEST_F(DeleteTreeWorkItemTest, DeleteTreeInUse) {
   // Create tree to be deleted
   FilePath dir_name_delete(test_dir_);
   dir_name_delete = dir_name_delete.AppendASCII("to_be_delete");
-  CreateDirectory(dir_name_delete.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete));
 
   FilePath dir_name_delete_1(dir_name_delete);
   dir_name_delete_1 = dir_name_delete_1.AppendASCII("1");
-  CreateDirectory(dir_name_delete_1.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_1);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_1));
 
   FilePath dir_name_delete_2(dir_name_delete);
   dir_name_delete_2 = dir_name_delete_2.AppendASCII("2");
-  CreateDirectory(dir_name_delete_2.value().c_str(), NULL);
+  file_util::CreateDirectory(dir_name_delete_2);
   ASSERT_TRUE(file_util::PathExists(dir_name_delete_2));
 
   FilePath file_name_delete_1(dir_name_delete_1);
   file_name_delete_1 = file_name_delete_1.AppendASCII("File_1.txt");
   CreateTextFile(file_name_delete_1.value(), text_content_1);
   ASSERT_TRUE(file_util::PathExists(file_name_delete_1));
 
   FilePath file_name_delete_2(dir_name_delete_2);
   file_name_delete_2 = file_name_delete_2.AppendASCII("File_2.txt");
   CreateTextFile(file_name_delete_2.value(), text_content_1);
@@ skipping 33 matching lines @@
 
   // verify everything is still there.
   EXPECT_TRUE(file_util::PathExists(key_path));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
   EXPECT_TRUE(file_util::PathExists(file_name_delete_2));
 
   TerminateProcess(pi.hProcess, 0);
   // make sure the handle is closed.
   WaitForSingleObject(pi.hProcess, INFINITE);
 }