Componentize component_updater: Decouple in-process DeltaUpdateOp from out-of-process version.

chrome/browser/component_updater/component_patcher.h

 // Copyright 2013 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.
 
 // Component updates can be either differential updates or full updates.
 // Full updates come in CRX format; differential updates come in CRX-style
 // archives, but have a different magic number. They contain "commands.json", a
 // list of commands for the patcher to follow. The patcher uses these commands,
 // the other files in the archive, and the files from the existing installation
 // of the component to create the contents of a full update, which is then
@@ skipping 22 matching lines @@
 #include "chrome/browser/component_updater/component_unpacker.h"
 
 namespace base {
 class FilePath;
 }
 
 namespace component_updater {
 
 class ComponentInstaller;
 class DeltaUpdateOp;
+class DeltaUpdateOpFactory;
 
 // The type of a patch file.
 enum PatchType {
   kPatchTypeUnknown,
   kPatchTypeCourgette,
   kPatchTypeBsdiff,
 };
 
 // Encapsulates a task for applying a differential update to a component.
 class ComponentPatcher : public base::RefCountedThreadSafe<ComponentPatcher> {
  public:
   // Takes an unpacked differential CRX (|input_dir|) and a component installer,
   // and sets up the class to create a new (non-differential) unpacked CRX.
   // If |in_process| is true, patching will be done completely within the
   // existing process. Otherwise, some steps of patching may be done
   // out-of-process.
   ComponentPatcher(const base::FilePath& input_dir,
                    const base::FilePath& unpack_dir,
                    ComponentInstaller* installer,
-                   bool in_process,
+                   DeltaUpdateOpFactory* delta_update_op_factory,

[blundell, 2014/07/25 07:40:42]

If this object takes ownership of the factory, it should be passed in as a
scoped_ptr.

[tommycli, 2014/07/25 18:08:47]

I changed all the usages of this class to use scoped_ptr

                    scoped_refptr<base::SequencedTaskRunner> task_runner);
 
   // Starts patching files. This member function returns immediately, after
   // posting a task to do the patching. When patching has been completed,
   // |callback| will be called with the error codes if any error codes were
   // encountered.
   void Start(const ComponentUnpacker::Callback& callback);
 
  private:
   friend class base::RefCountedThreadSafe<ComponentPatcher>;
 
   virtual ~ComponentPatcher();
 
   void StartPatching();
 
   void PatchNextFile();
 
   void DonePatchingFile(ComponentUnpacker::Error error, int extended_error);
 
   void DonePatching(ComponentUnpacker::Error error, int extended_error);
 
   const base::FilePath input_dir_;
   const base::FilePath unpack_dir_;
   ComponentInstaller* const installer_;
-  const bool in_process_;
+  scoped_ptr<DeltaUpdateOpFactory> delta_update_op_factory_;
   ComponentUnpacker::Callback callback_;
   scoped_ptr<base::ListValue> commands_;
   base::ValueVector::const_iterator next_command_;
   scoped_refptr<DeltaUpdateOp> current_operation_;
   scoped_refptr<base::SequencedTaskRunner> task_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(ComponentPatcher);
 };
 
 }  // namespace component_updater
 
 #endif  // CHROME_BROWSER_COMPONENT_UPDATER_COMPONENT_PATCHER_H_