Create VisualElementsManifest.xml from template -- install VisualElements in the version directory

chrome/installer/util/work_item.cc

Index: chrome/installer/util/work_item.cc
diff --git a/chrome/installer/util/work_item.cc b/chrome/installer/util/work_item.cc
index 8b7bb11f8a24b073f660c7caf551d255f9cc808a..57ca02fd2e60cbe89e56a668b01f1807fc8d17fd 100644
--- a/chrome/installer/util/work_item.cc
+++ b/chrome/installer/util/work_item.cc
@@ -12,6 +12,7 @@
 #include "chrome/installer/util/delete_tree_work_item.h"
 #include "chrome/installer/util/delete_reg_key_work_item.h"
 #include "chrome/installer/util/delete_reg_value_work_item.h"
+#include "chrome/installer/util/file_from_template_work_item.h"
 #include "chrome/installer/util/move_tree_work_item.h"
 #include "chrome/installer/util/self_reg_work_item.h"
 #include "chrome/installer/util/set_reg_value_work_item.h"
@@ -25,8 +26,8 @@ WorkItem::~WorkItem() {
 
 CopyRegKeyWorkItem* WorkItem::CreateCopyRegKeyWorkItem(
     HKEY predefined_root,
-    const std::wstring& source_key_path,
-    const std::wstring& dest_key_path,
+    const string16& source_key_path,
+    const string16& dest_key_path,
     CopyOverWriteOption overwrite_option) {
   return new CopyRegKeyWorkItem(predefined_root, source_key_path,
                                 dest_key_path, overwrite_option);
@@ -47,19 +48,19 @@ CreateDirWorkItem* WorkItem::CreateCreateDirWorkItem(const FilePath& path) {
 }
 
 CreateRegKeyWorkItem* WorkItem::CreateCreateRegKeyWorkItem(
-    HKEY predefined_root, const std::wstring& path) {
+    HKEY predefined_root, const string16& path) {
   return new CreateRegKeyWorkItem(predefined_root, path);
 }
 
 DeleteRegKeyWorkItem* WorkItem::CreateDeleteRegKeyWorkItem(
-    HKEY predefined_root, const std::wstring& path) {
+    HKEY predefined_root, const string16& path) {
   return new DeleteRegKeyWorkItem(predefined_root, path);
 }
 
 DeleteRegValueWorkItem* WorkItem::CreateDeleteRegValueWorkItem(
     HKEY predefined_root,
-    const std::wstring& key_path,
-    const std::wstring& value_name) {
+    const string16& key_path,
+    const string16& value_name) {
   return new DeleteRegValueWorkItem(predefined_root, key_path, value_name);
 }
 
@@ -70,6 +71,17 @@ DeleteTreeWorkItem* WorkItem::CreateDeleteTreeWorkItem(
   return new DeleteTreeWorkItem(root_path, temp_path, key_paths);
 }
 
+FileFromTemplateWorkItem* WorkItem::CreateFileFromTemplateWorkItem(
+    const FilePath& source_path,
+    const FilePath& dest_path,
+    const FilePath& temp_dir,
+    const std::map<string16, string16>& mappings) {
+  return new FileFromTemplateWorkItem(source_path,
+                                      dest_path,
+                                      temp_dir,
+                                      mappings);
+}
+
 MoveTreeWorkItem* WorkItem::CreateMoveTreeWorkItem(
     const FilePath& source_path,
     const FilePath& dest_path,
@@ -83,9 +95,9 @@ MoveTreeWorkItem* WorkItem::CreateMoveTreeWorkItem(
 
 SetRegValueWorkItem* WorkItem::CreateSetRegValueWorkItem(
     HKEY predefined_root,
-    const std::wstring& key_path,
-    const std::wstring& value_name,
-    const std::wstring& value_data,
+    const string16& key_path,
+    const string16& value_name,
+    const string16& value_data,
     bool overwrite) {
   return new SetRegValueWorkItem(predefined_root, key_path,
                                  value_name, value_data, overwrite);
@@ -93,8 +105,8 @@ SetRegValueWorkItem* WorkItem::CreateSetRegValueWorkItem(
 
 SetRegValueWorkItem* WorkItem::CreateSetRegValueWorkItem(
     HKEY predefined_root,
-    const std::wstring& key_path,
-    const std::wstring& value_name,
+    const string16& key_path,
+    const string16& value_name,
     DWORD value_data,
     bool overwrite) {
   return new SetRegValueWorkItem(predefined_root, key_path,
@@ -103,15 +115,15 @@ SetRegValueWorkItem* WorkItem::CreateSetRegValueWorkItem(
 
 SetRegValueWorkItem* WorkItem::CreateSetRegValueWorkItem(
     HKEY predefined_root,
-    const std::wstring& key_path,
-    const std::wstring& value_name,
+    const string16& key_path,
+    const string16& value_name,
     int64 value_data,
     bool overwrite) {
   return new SetRegValueWorkItem(predefined_root, key_path,
                                  value_name, value_data, overwrite);
 }
 
-SelfRegWorkItem* WorkItem::CreateSelfRegWorkItem(const std::wstring& dll_path,
+SelfRegWorkItem* WorkItem::CreateSelfRegWorkItem(const string16& dll_path,
                                                  bool do_register,
                                                  bool user_level_registration) {
   return new SelfRegWorkItem(dll_path, do_register, user_level_registration);