Significantly cleans up the ImageWriter Operation class and subclasses.

chrome/browser/extensions/api/image_writer_private/operation_manager.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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_MANAGER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_MANAGER_H_
 
 #include <map>
 #include <string>
 #include "base/bind.h"
@@ skipping 27 matching lines @@
   typedef std::string ExtensionId;
 
   explicit OperationManager(Profile* profile);
   virtual ~OperationManager();
 
   virtual void Shutdown() OVERRIDE;
 
   // Starts a WriteFromUrl operation.
   void StartWriteFromUrl(const ExtensionId& extension_id,
                          GURL url,
-                         content::RenderViewHost* rvh,
                          const std::string& hash,
                          bool saveImageAsDownload,
-                         const std::string& storage_unit_id,
+                         const std::string& device_path,
                          const Operation::StartWriteCallback& callback);
 
   // Starts a WriteFromFile operation.
   void StartWriteFromFile(const ExtensionId& extension_id,
                           const base::FilePath& path,
-                          const std::string& storage_unit_id,
+                          const std::string& device_path,
                           const Operation::StartWriteCallback& callback);
 
   // Cancels the extensions current operation if any.
   void CancelWrite(const ExtensionId& extension_id,
                    const Operation::CancelWriteCallback& callback);
 
   // Starts a write that removes the partition table.
   void DestroyPartitions(const ExtensionId& extension_id,
-                         const std::string& storage_unit_id,
+                         const std::string& device_path,
                          const Operation::StartWriteCallback& callback);
 
   // Callback for progress events.
   virtual void OnProgress(const ExtensionId& extension_id,
                           image_writer_api::Stage stage,
                           int progress);
   // Callback for completion events.
   virtual void OnComplete(const ExtensionId& extension_id);
 
   // Callback for error events.
@@ skipping 32 matching lines @@
 
   base::WeakPtrFactory<OperationManager> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(OperationManager);
 };
 
 }  // namespace image_writer
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_IMAGE_WRITER_PRIVATE_OPERATION_MANAGER_H_