Merge 101684 - Added CopyRegKeyWorkItem in support of IE low rights policy fixes.

chrome/installer/util/delete_reg_key_work_item.h

Index: chrome/installer/util/delete_reg_key_work_item.h
===================================================================
--- chrome/installer/util/delete_reg_key_work_item.h	(revision 104337)
+++ chrome/installer/util/delete_reg_key_work_item.h	(working copy)
@@ -11,9 +11,12 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/compiler_specific.h"
+#include "chrome/installer/util/registry_key_backup.h"
 #include "chrome/installer/util/work_item.h"
 
+class RegistryKeyBackup;
+
 // A WorkItem subclass that deletes a registry key at the given path.  Be aware
 // that in the event of rollback the key's values and subkeys are restored but
 // the key and its subkeys take on their default security descriptors.
@@ -21,12 +24,11 @@
  public:
   virtual ~DeleteRegKeyWorkItem();
 
-  virtual bool Do();
+  virtual bool Do() OVERRIDE;
 
-  virtual void Rollback();
+  virtual void Rollback() OVERRIDE;
 
  private:
-  class RegKeyBackup;
   friend class WorkItem;
 
   DeleteRegKeyWorkItem(HKEY predefined_root, const std::wstring& path);
@@ -39,7 +41,7 @@
   std::wstring path_;
 
   // Backup of the deleted key.
-  scoped_ptr<RegKeyBackup> backup_;
+  RegistryKeyBackup backup_;
 
   DISALLOW_COPY_AND_ASSIGN(DeleteRegKeyWorkItem);
 };