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

chrome/installer/util/work_item.h

Index: chrome/installer/util/work_item.h
diff --git a/chrome/installer/util/work_item.h b/chrome/installer/util/work_item.h
index 6c345a903ec307e12d47cd66ec290b55225becbf..cedaa4c09e393c8a6b536e02f6e52eb712ea8139 100644
--- a/chrome/installer/util/work_item.h
+++ b/chrome/installer/util/work_item.h
@@ -12,10 +12,11 @@
 
 #include <windows.h>
 
-#include <string>
+#include <map>
 #include <vector>
 
 #include "base/basictypes.h"
+#include "base/string16.h"
 
 class CopyRegKeyWorkItem;
 class CopyTreeWorkItem;
@@ -24,6 +25,7 @@ class CreateRegKeyWorkItem;
 class DeleteTreeWorkItem;
 class DeleteRegKeyWorkItem;
 class DeleteRegValueWorkItem;
+class FileFromTemplateWorkItem;
 class FilePath;
 class MoveTreeWorkItem;
 class SelfRegWorkItem;
@@ -62,8 +64,8 @@ class WorkItem {
   // Create a CopyRegKeyWorkItem that recursively copies a given registry key.
   static CopyRegKeyWorkItem* 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);
 
   // Create a CopyTreeWorkItem that recursively copies a file system hierarchy
@@ -85,18 +87,18 @@ class WorkItem {
   // Create a CreateRegKeyWorkItem that creates a registry key at the given
   // path.
   static CreateRegKeyWorkItem* CreateCreateRegKeyWorkItem(
-      HKEY predefined_root, const std::wstring& path);
+      HKEY predefined_root, const string16& path);
 
   // Create a DeleteRegKeyWorkItem that deletes a registry key at the given
   // path.
   static DeleteRegKeyWorkItem* CreateDeleteRegKeyWorkItem(
-      HKEY predefined_root, const std::wstring& path);
+      HKEY predefined_root, const string16& path);
 
   // Create a DeleteRegValueWorkItem that deletes a registry value
   static DeleteRegValueWorkItem* CreateDeleteRegValueWorkItem(
       HKEY predefined_root,
-      const std::wstring& key_path,
-      const std::wstring& value_name);
+      const string16& key_path,
+      const string16& value_name);
 
   // Create a DeleteTreeWorkItem that recursively deletes a file system
   // hierarchy at the given root path. A key file can be optionally specified
@@ -106,6 +108,14 @@ class WorkItem {
       const FilePath& temp_path,
       const std::vector<FilePath>& key_paths);
 
+  // Create a FileFromTemplateWorkItem that extracts a template from
+  // |source_path| and writes the resulting file to |dest_path|.
+  static FileFromTemplateWorkItem* CreateFileFromTemplateWorkItem(
+      const FilePath& source_path,
+      const FilePath& dest_path,
+      const FilePath& temp_dir,
+      const std::map<string16, string16>& mappings);
+
   // Create a MoveTreeWorkItem that recursively moves a file system hierarchy
   // from source path to destination path.
   static MoveTreeWorkItem* CreateMoveTreeWorkItem(
@@ -118,30 +128,30 @@ class WorkItem {
   // at the key with specified path.
   static SetRegValueWorkItem* 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);
 
   // Create a SetRegValueWorkItem that sets a registry value with REG_DWORD type
   // at the key with specified path.
   static SetRegValueWorkItem* 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);
 
   // Create a SetRegValueWorkItem that sets a registry value with REG_QWORD type
   // at the key with specified path.
   static SetRegValueWorkItem* 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);
 
   // Add a SelfRegWorkItem that registers or unregisters a DLL at the
   // specified path.
-  static SelfRegWorkItem* CreateSelfRegWorkItem(const std::wstring& dll_path,
+  static SelfRegWorkItem* CreateSelfRegWorkItem(const string16& dll_path,
                                                 bool do_register,
                                                 bool user_level_registration);