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

chrome/installer/util/work_item_list.cc

Index: chrome/installer/util/work_item_list.cc
diff --git a/chrome/installer/util/work_item_list.cc b/chrome/installer/util/work_item_list.cc
index f9808c0c511c319b8a678cfdd80a90a1310207be..fa03a4f617b5bfc994883b9e48dd39d0309cf5be 100644
--- a/chrome/installer/util/work_item_list.cc
+++ b/chrome/installer/util/work_item_list.cc
@@ -14,6 +14,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"
@@ -75,8 +76,8 @@ void WorkItemList::AddWorkItem(WorkItem* work_item) {
 
 WorkItem* WorkItemList::AddCopyRegKeyWorkItem(
     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) {
   WorkItem* item = WorkItem::CreateCopyRegKeyWorkItem(
       predefined_root, source_key_path, dest_key_path, overwrite_option);
@@ -85,11 +86,11 @@ WorkItem* WorkItemList::AddCopyRegKeyWorkItem(
 }
 
 WorkItem* WorkItemList::AddCopyTreeWorkItem(
-    const std::wstring& source_path,
-    const std::wstring& dest_path,
-    const std::wstring& temp_dir,
+    const string16& source_path,
+    const string16& dest_path,
+    const string16& temp_dir,
     CopyOverWriteOption overwrite_option,
-    const std::wstring& alternative_path) {
+    const string16& alternative_path) {
   WorkItem* item = WorkItem::CreateCopyTreeWorkItem(FilePath(source_path),
                                                     FilePath(dest_path),
                                                     FilePath(temp_dir),
@@ -106,14 +107,14 @@ WorkItem* WorkItemList::AddCreateDirWorkItem(const FilePath& path) {
 }
 
 WorkItem* WorkItemList::AddCreateRegKeyWorkItem(HKEY predefined_root,
-                                                const std::wstring& path) {
+                                                const string16& path) {
   WorkItem* item = WorkItem::CreateCreateRegKeyWorkItem(predefined_root, path);
   AddWorkItem(item);
   return item;
 }
 
 WorkItem* WorkItemList::AddDeleteRegKeyWorkItem(HKEY predefined_root,
-                                                const std::wstring& path) {
+                                                const string16& path) {
   WorkItem* item = WorkItem::CreateDeleteRegKeyWorkItem(predefined_root, path);
   AddWorkItem(item);
   return item;
@@ -121,8 +122,8 @@ WorkItem* WorkItemList::AddDeleteRegKeyWorkItem(HKEY predefined_root,
 
 WorkItem* WorkItemList::AddDeleteRegValueWorkItem(
     HKEY predefined_root,
-    const std::wstring& key_path,
-    const std::wstring& value_name) {
+    const string16& key_path,
+    const string16& value_name) {
   WorkItem* item = WorkItem::CreateDeleteRegValueWorkItem(predefined_root,
                                                           key_path, value_name);
   AddWorkItem(item);
@@ -145,9 +146,23 @@ WorkItem* WorkItemList::AddDeleteTreeWorkItem(const FilePath& root_path,
   return AddDeleteTreeWorkItem(root_path, temp_path, no_key_files);
 }
 
-WorkItem* WorkItemList::AddMoveTreeWorkItem(const std::wstring& source_path,
-                                            const std::wstring& dest_path,
-                                            const std::wstring& temp_dir,
+WorkItem* WorkItemList::AddFileFromTemplateWorkItem(
+    const string16& source_path,
+    const string16& dest_path,
+    const string16& temp_dir,
+    const std::map<string16, string16>& mappings) {
+  WorkItem* item = WorkItem::CreateFileFromTemplateWorkItem(
+      FilePath(source_path),
+      FilePath(dest_path),
+      FilePath(temp_dir),
+      mappings);
+  AddWorkItem(item);
+  return item;
+}
+
+WorkItem* WorkItemList::AddMoveTreeWorkItem(const string16& source_path,
+                                            const string16& dest_path,
+                                            const string16& temp_dir,
                                             MoveTreeOption duplicate_option) {
   WorkItem* item = WorkItem::CreateMoveTreeWorkItem(FilePath(source_path),
                                                     FilePath(dest_path),
@@ -159,9 +174,9 @@ WorkItem* WorkItemList::AddMoveTreeWorkItem(const std::wstring& source_path,
 
 WorkItem* WorkItemList::AddSetRegValueWorkItem(
     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) {
   WorkItem* item = WorkItem::CreateSetRegValueWorkItem(predefined_root,
                                                        key_path,
@@ -173,8 +188,8 @@ WorkItem* WorkItemList::AddSetRegValueWorkItem(
 }
 
 WorkItem* WorkItemList::AddSetRegValueWorkItem(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) {
   WorkItem* item = WorkItem::CreateSetRegValueWorkItem(predefined_root,
@@ -187,8 +202,8 @@ WorkItem* WorkItemList::AddSetRegValueWorkItem(HKEY predefined_root,
 }
 
 WorkItem* WorkItemList::AddSetRegValueWorkItem(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) {
   WorkItem* item = reinterpret_cast<WorkItem*>(
@@ -198,7 +213,7 @@ WorkItem* WorkItemList::AddSetRegValueWorkItem(HKEY predefined_root,
   return item;
 }
 
-WorkItem* WorkItemList::AddSelfRegWorkItem(const std::wstring& dll_path,
+WorkItem* WorkItemList::AddSelfRegWorkItem(const string16& dll_path,
                                            bool do_register,
                                            bool user_level_registration) {
   WorkItem* item = WorkItem::CreateSelfRegWorkItem(dll_path, do_register,