Revert of Significantly cleans up the ImageWriter Operation class and subclasses.

chrome/browser/extensions/api/image_writer_private/operation_manager.cc

 // 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.
 
 #include "base/lazy_instance.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation.h"
 #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
 #include "chrome/browser/extensions/api/image_writer_private/operation.h"
@@ skipping 41 matching lines @@
     BrowserThread::PostTask(BrowserThread::FILE,
                             FROM_HERE,
                             base::Bind(&Operation::Abort,
                                        iter->second));
   }
 }
 
 void OperationManager::StartWriteFromUrl(
     const ExtensionId& extension_id,
     GURL url,
+    content::RenderViewHost* rvh,
     const std::string& hash,
-    const std::string& device_path,
+    bool saveImageAsDownload,
+    const std::string& storage_unit_id,
     const Operation::StartWriteCallback& callback) {
   OperationMap::iterator existing_operation = operations_.find(extension_id);
 
   if (existing_operation != operations_.end()) {
     return callback.Run(false, error::kOperationAlreadyInProgress);
   }
 
   scoped_refptr<Operation> operation(
       new WriteFromUrlOperation(weak_factory_.GetWeakPtr(),
                                 extension_id,
-                                profile_->GetRequestContext(),
+                                rvh,
                                 url,
                                 hash,
-                                device_path));
+                                saveImageAsDownload,
+                                storage_unit_id));
   operations_[extension_id] = operation;
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&Operation::Start, operation));
   callback.Run(true, "");
 }
 
 void OperationManager::StartWriteFromFile(
     const ExtensionId& extension_id,
     const base::FilePath& path,
-    const std::string& device_path,
+    const std::string& storage_unit_id,
     const Operation::StartWriteCallback& callback) {
   OperationMap::iterator existing_operation = operations_.find(extension_id);
 
   if (existing_operation != operations_.end()) {
     return callback.Run(false, error::kOperationAlreadyInProgress);
   }
 
-  scoped_refptr<Operation> operation(new WriteFromFileOperation(
-      weak_factory_.GetWeakPtr(), extension_id, path, device_path));
+  scoped_refptr<Operation> operation(
+      new WriteFromFileOperation(weak_factory_.GetWeakPtr(),
+                                 extension_id,
+                                 path,
+                                 storage_unit_id));
   operations_[extension_id] = operation;
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&Operation::Start, operation));
   callback.Run(true, "");
 }
 
 void OperationManager::CancelWrite(
     const ExtensionId& extension_id,
     const Operation::CancelWriteCallback& callback) {
   Operation* existing_operation = GetOperation(extension_id);
 
   if (existing_operation == NULL) {
     callback.Run(false, error::kNoOperationInProgress);
   } else {
     BrowserThread::PostTask(BrowserThread::FILE,
                             FROM_HERE,
                             base::Bind(&Operation::Cancel, existing_operation));
     DeleteOperation(extension_id);
     callback.Run(true, "");
   }
 }
 
 void OperationManager::DestroyPartitions(
     const ExtensionId& extension_id,
-    const std::string& device_path,
+    const std::string& storage_unit_id,
     const Operation::StartWriteCallback& callback) {
   OperationMap::iterator existing_operation = operations_.find(extension_id);
 
   if (existing_operation != operations_.end()) {
     return callback.Run(false, error::kOperationAlreadyInProgress);
   }
 
-  scoped_refptr<Operation> operation(new DestroyPartitionsOperation(
-      weak_factory_.GetWeakPtr(), extension_id, device_path));
+  scoped_refptr<Operation> operation(
+      new DestroyPartitionsOperation(weak_factory_.GetWeakPtr(),
+                                     extension_id,
+                                     storage_unit_id));
   operations_[extension_id] = operation;
   BrowserThread::PostTask(BrowserThread::FILE,
                           FROM_HERE,
                           base::Bind(&Operation::Start, operation));
   callback.Run(true, "");
 }
 
 void OperationManager::OnProgress(const ExtensionId& extension_id,
                                   image_writer_api::Stage stage,
                                   int progress) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+  DVLOG(2) << "progress - " << stage << " at " << progress << "%";
 
   image_writer_api::ProgressInfo info;
   info.stage = stage;
   info.percent_complete = progress;
 
   scoped_ptr<base::ListValue> args(
       image_writer_api::OnWriteProgress::Create(info));
   scoped_ptr<Event> event(new Event(
       image_writer_api::OnWriteProgress::kEventName, args.Pass()));
 
@@ skipping 94 matching lines @@
     g_factory = LAZY_INSTANCE_INITIALIZER;
 
 ProfileKeyedAPIFactory<OperationManager>*
     OperationManager::GetFactoryInstance() {
   return g_factory.Pointer();
 }
 
 
 }  // namespace image_writer
 }  // namespace extensions