Adds imageWriterPrivate support for Windows

chrome/browser/extensions/api/image_writer_private/operation_unittest.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/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "chrome/browser/extensions/api/image_writer_private/error_messages.h"
 #include "chrome/browser/extensions/api/image_writer_private/operation.h"
@@ skipping 60 matching lines @@
                                                &image_file_));
     ASSERT_TRUE(base::CreateTemporaryFile(&zip_file_));
 
     scoped_ptr<char[]> buffer(new char[kTestFileSize]);
     memset(buffer.get(), kImagePattern, kTestFileSize);
     file_util::WriteFile(image_file_, buffer.get(), kTestFileSize);
 
     zip::Zip(temp_dir_.path(), zip_file_, true);
   }
 
-  virtual void TearDown() OVERRIDE {
-    ImageWriterUnitTestBase::TearDown();
-  }
-
   base::ScopedTempDir temp_dir_;
   base::FilePath image_file_;
   base::FilePath zip_file_;
 };
 
 } // namespace
 
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN)
 // Tests a successful unzip.
 TEST_F(ImageWriterOperationTest, Unzip) {
-  MockOperationManager manager;
+  base::RunLoop loop;
+  QuittingMockManager manager(loop.QuitClosure());
 
   scoped_refptr<OperationForTest> operation(
       new OperationForTest(manager.AsWeakPtr(),
                            kDummyExtensionId,
                            test_device_path_.AsUTF8Unsafe()));
 
   scoped_ptr<base::FilePath> zip_file(new base::FilePath(zip_file_));
 
   // At least one progress report > 0% and < 100%.
   EXPECT_CALL(manager, OnProgress(kDummyExtensionId,
@@ skipping 15 matching lines @@
   EXPECT_CALL(manager, OnComplete(kDummyExtensionId)).Times(1);
   // No errors
   EXPECT_CALL(manager, OnError(_, _, _, _)).Times(0);
 
   content::BrowserThread::PostTask(content::BrowserThread::FILE,
                                    FROM_HERE,
                                    base::Bind(&OperationForTest::UnzipStart,
                                               operation,
                                               base::Passed(&zip_file)));
 
-  base::RunLoop().RunUntilIdle();
+  loop.Run();
 
-  EXPECT_TRUE(base::ContentsEqual(image_file_, test_device_path_));
+  EXPECT_TRUE(ImageWrittenToDevice(image_file_, test_device_path_));
 }
 #endif
 
 TEST_F(ImageWriterOperationTest, Creation) {
   MockOperationManager manager;
   scoped_refptr<Operation> op(
       new OperationForTest(manager.AsWeakPtr(),
                            kDummyExtensionId,
                            test_device_path_.AsUTF8Unsafe()));
 
   EXPECT_EQ(0, op->GetProgress());
   EXPECT_EQ(image_writer_api::STAGE_UNKNOWN, op->GetStage());
 }
 
 }  // namespace image_writer
 }  // namespace extensions