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

chrome/browser/extensions/api/image_writer_private/test_utils.h

Index: chrome/browser/extensions/api/image_writer_private/test_utils.h
diff --git a/chrome/browser/extensions/api/image_writer_private/test_utils.h b/chrome/browser/extensions/api/image_writer_private/test_utils.h
index a19a48c6446e151cd809652a178b64b4525510e3..b290e881ee87e86dd7096e3d1bfb981b5d9c5517 100644
--- a/chrome/browser/extensions/api/image_writer_private/test_utils.h
+++ b/chrome/browser/extensions/api/image_writer_private/test_utils.h
@@ -31,7 +31,6 @@
 class MockOperationManager : public OperationManager {
  public:
   MockOperationManager();
-  explicit MockOperationManager(Profile* profile);
   virtual ~MockOperationManager();
 
   MOCK_METHOD3(OnProgress, void(const ExtensionId& extension_id,
@@ -58,17 +57,21 @@
 
   virtual void TearDown() OVERRIDE;
 
+  // Compare the image and device files, returning true if they are the same,
+  // false if different.
+  bool CompareImageAndDevice();
+
+  base::ScopedTempDir temp_dir_;
+  base::FilePath test_image_path_;
+  base::FilePath test_device_path_;
+
+ private:
   // Fills |file| with |length| bytes of |pattern|, overwriting any existing
   // data.
   bool FillFile(const base::FilePath& file,
                 const int pattern,
                 const int length);
 
-  base::ScopedTempDir temp_dir_;
-  base::FilePath test_image_path_;
-  base::FilePath test_device_path_;
-
- private:
   content::TestBrowserThreadBundle thread_bundle_;
 };