Support for checking multiple keyfiles when removing an installation package....

chrome/installer/util/delete_tree_work_item_unittest.cc

 // Copyright (c) 2010 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 67 matching lines @@
   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);
   ASSERT_TRUE(file_util::PathExists(file_name_delete_2));
 
   // test Do()
+  std::vector<FilePath> key_files;
   scoped_ptr<DeleteTreeWorkItem> work_item(
-      WorkItem::CreateDeleteTreeWorkItem(dir_name_delete.ToWStringHack(),
-                                         std::wstring()));
+      WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_files));
   EXPECT_TRUE(work_item->Do());
 
   // everything should be gone
   EXPECT_FALSE(file_util::PathExists(file_name_delete_1));
   EXPECT_FALSE(file_util::PathExists(file_name_delete_2));
   EXPECT_FALSE(file_util::PathExists(dir_name_delete));
 
   work_item->Rollback();
   // everything should come back
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
@@ skipping 25 matching lines @@
   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);
   ASSERT_TRUE(file_util::PathExists(file_name_delete_2));
 
   // test Do()
+  std::vector<FilePath> key_files(1, file_name_delete_1);
   scoped_ptr<DeleteTreeWorkItem> work_item(
-      WorkItem::CreateDeleteTreeWorkItem(dir_name_delete.ToWStringHack(),
-                                         file_name_delete_1.ToWStringHack()));
+      WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_files));
   EXPECT_TRUE(work_item->Do());
 
   // everything should be gone
   EXPECT_FALSE(file_util::PathExists(file_name_delete_1));
   EXPECT_FALSE(file_util::PathExists(file_name_delete_2));
   EXPECT_FALSE(file_util::PathExists(dir_name_delete));
 
   work_item->Rollback();
   // everything should come back
   EXPECT_TRUE(file_util::PathExists(file_name_delete_1));
@@ skipping 46 matching lines @@
   // Run the key path file to keep it in use.
   STARTUPINFOW si = {sizeof(si)};
   PROCESS_INFORMATION pi = {0};
   ASSERT_TRUE(
       ::CreateProcessW(NULL, const_cast<wchar_t*>(key_path.value().c_str()),
                        NULL, NULL, FALSE, CREATE_NO_WINDOW | CREATE_SUSPENDED,
                        NULL, NULL, &si, &pi));
 
   // test Do().
   {
+    std::vector<FilePath> key_paths(1, key_path);
     scoped_ptr<DeleteTreeWorkItem> work_item(
-        WorkItem::CreateDeleteTreeWorkItem(dir_name_delete.ToWStringHack(),
-                                           key_path.ToWStringHack()));
+        WorkItem::CreateDeleteTreeWorkItem(dir_name_delete, key_paths));
 
     // delete should fail as file in use.
     EXPECT_FALSE(work_item->Do());
   }
 
   // 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);
 }