Refactor install.cc into the work item parts and the non-work item parts.

chrome/installer/util/work_item_list.h

 // 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.
 
 #ifndef CHROME_INSTALLER_UTIL_WORK_ITEM_LIST_H_
 #define CHROME_INSTALLER_UTIL_WORK_ITEM_LIST_H_
 #pragma once
 
 #include <windows.h>
 
@@ skipping 17 matching lines @@
   // Execute the WorkItems in the same order as they are added to the list.
   // It aborts as soon as one WorkItem fails.
   virtual bool Do();
 
   // Rollback the WorkItems in the reverse order as they are executed.
   virtual void Rollback();
 
   // Add a WorkItem to the list.
   // A WorkItem can only be added to the list before the list's DO() is called.
   // Once a WorkItem is added to the list. The list owns the WorkItem.
-  void AddWorkItem(WorkItem* work_item);
+  virtual void AddWorkItem(WorkItem* work_item);

[erikwright (departed), 2011/01/12 16:31:49]

I would prefer this to be split into a pure-virtual class and an implementation.
Otherwise, someone can add a new method, forget to add a mock for it, and the
tests will actually call the implementation method (wreaking havoc on the
builder).

[amit, 2011/01/12 17:41:22]

+1

[robertshield, 2011/01/13 17:06:32]

Done.

[robertshield, 2011/01/13 17:06:32]

I completely agree, but this leads in to the WorkItem/WorkItemList refactoring
that we'd also liketo perform to remove the redundant double factory
implementation we have now. I would like to defer this for now and leave a TODO
to do as you suggest, if you don't strongly object.

 
   // Add a CopyTreeWorkItem to the list of work items.
-  WorkItem* AddCopyTreeWorkItem(const std::wstring& source_path,
-                                const std::wstring& dest_path,
-                                const std::wstring& temp_dir,
-                                CopyOverWriteOption overwrite_option,
-                                const std::wstring& alternative_path = L"");
+  virtual WorkItem* AddCopyTreeWorkItem(
+      const std::wstring& source_path,
+      const std::wstring& dest_path,
+      const std::wstring& temp_dir,
+      CopyOverWriteOption overwrite_option,
+      const std::wstring& alternative_path = L"");
 
   // Add a CreateDirWorkItem that creates a directory at the given path.
-  WorkItem* AddCreateDirWorkItem(const FilePath& path);
+  virtual WorkItem* AddCreateDirWorkItem(const FilePath& path);
 
   // Add a CreateRegKeyWorkItem that creates a registry key at the given
   // path.
-  WorkItem* AddCreateRegKeyWorkItem(HKEY predefined_root,
-                                    const std::wstring& path);
+  virtual WorkItem* AddCreateRegKeyWorkItem(HKEY predefined_root,
+                                            const std::wstring& path);
 
   // Add a DeleteRegKeyWorkItem that deletes a registry key from the given
   // path.
-  WorkItem* AddDeleteRegKeyWorkItem(HKEY predefined_root,
-                                    const std::wstring& path);
+  virtual WorkItem* AddDeleteRegKeyWorkItem(HKEY predefined_root,
+                                            const std::wstring& path);
 
   // Add a DeleteRegValueWorkItem that deletes registry value of type REG_SZ
   // or REG_DWORD.
-  WorkItem* AddDeleteRegValueWorkItem(HKEY predefined_root,
-                                      const std::wstring& key_path,
-                                      const std::wstring& value_name,
-                                      bool is_str_type);
+  virtual WorkItem* AddDeleteRegValueWorkItem(HKEY predefined_root,
+                                              const std::wstring& key_path,
+                                              const std::wstring& value_name,
+                                              bool is_str_type);
 
   // Add a DeleteTreeWorkItem that recursively deletes a file system
   // hierarchy at the given root path. A key file can be optionally specified
   // by key_path.
-  WorkItem* AddDeleteTreeWorkItem(const FilePath& root_path,
-                                  const std::vector<FilePath>& key_paths);
+  virtual WorkItem* AddDeleteTreeWorkItem(
+      const FilePath& root_path,
+      const std::vector<FilePath>& key_paths);
 
   // Same as above but without support for key files.
-  WorkItem* AddDeleteTreeWorkItem(const FilePath& root_path);
+  virtual WorkItem* AddDeleteTreeWorkItem(const FilePath& root_path);
 
   // Add a MoveTreeWorkItem to the list of work items.
-  WorkItem* AddMoveTreeWorkItem(const std::wstring& source_path,
-                                const std::wstring& dest_path,
-                                const std::wstring& temp_dir);
+  virtual WorkItem* AddMoveTreeWorkItem(const std::wstring& source_path,
+                                        const std::wstring& dest_path,
+                                        const std::wstring& temp_dir);
 
   // Add a SetRegValueWorkItem that sets a registry value with REG_SZ type
   // at the key with specified path.
-  WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
-                                   const std::wstring& key_path,
-                                   const std::wstring& value_name,
-                                   const std::wstring& value_data,
-                                   bool overwrite);
+  virtual WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
+                                           const std::wstring& key_path,
+                                           const std::wstring& value_name,
+                                           const std::wstring& value_data,
+                                           bool overwrite);
 
   // Add a SetRegValueWorkItem that sets a registry value with REG_DWORD type
   // at the key with specified path.
-  WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
-                                   const std::wstring& key_path,
-                                   const std::wstring& value_name,
-                                   DWORD value_data,
-                                   bool overwrite);
+  virtual WorkItem* AddSetRegValueWorkItem(HKEY predefined_root,
+                                           const std::wstring& key_path,
+                                           const std::wstring& value_name,
+                                           DWORD value_data,
+                                           bool overwrite);
 
   // Add a SelfRegWorkItem that registers or unregisters a DLL at the
   // specified path. If user_level_registration is true, then alternate
   // registration and unregistration entry point names will be used.
-  WorkItem* AddSelfRegWorkItem(const std::wstring& dll_path,
-                               bool do_register,
-                               bool user_level_registration);
+  virtual WorkItem* AddSelfRegWorkItem(const std::wstring& dll_path,
+                                       bool do_register,
+                                       bool user_level_registration);
 
  protected:
   friend class WorkItem;
 
   typedef std::list<WorkItem*> WorkItems;
   typedef WorkItems::iterator WorkItemIterator;
 
   enum ListStatus {
     // List has not been executed. Ok to add new WorkItem.
     ADD_ITEM,
@@ skipping 26 matching lines @@
   // Execute the WorkItems in the same order as they are added to the list.
   // If a WorkItem fails, the function will return failure but all other
   // WorkItems will still be executed.
   virtual bool Do();
 
   // Just does a NOTREACHED.
   virtual void Rollback();
 };
 
 #endif  // CHROME_INSTALLER_UTIL_WORK_ITEM_LIST_H_