Index: chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc |
diff --git a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc |
index 2b0fb93d9808582a14d86a3f3d62d41b81b8e56c..1159404de19fb9aafd30f156452f5a86b2f2f23a 100644 |
--- a/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc |
+++ b/chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc |
@@ -9,29 +9,30 @@ |
namespace extensions { |
namespace image_writer { |
+namespace { |
using testing::_; |
using testing::AnyNumber; |
-namespace { |
- |
class ImageWriterDestroyPartitionsOperationTest |
- : public ImageWriterUnitTestBase { |
-}; |
+ : public ImageWriterUnitTestBase {}; |
// Tests that the DestroyPartitionsOperation can successfully zero the first |
// kPartitionTableSize bytes of an image. |
TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitions) { |
- MockOperationManager manager; |
base::RunLoop loop; |
+ QuittingMockManager manager(loop.QuitClosure()); |
scoped_refptr<DestroyPartitionsOperation> operation( |
new DestroyPartitionsOperation(manager.AsWeakPtr(), |
kDummyExtensionId, |
test_device_path_.AsUTF8Unsafe())); |
-#if defined(OS_LINUX) || defined(OS_CHROMEOS) |
- EXPECT_CALL(manager, OnProgress(kDummyExtensionId, _, _)).Times(0); |
+#if defined(OS_LINUX) || defined(OS_CHROMEOS) || defined(OS_WIN) |
+ EXPECT_CALL( |
+ manager, |
+ OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _)) |
+ .Times(AnyNumber()); |
EXPECT_CALL(manager, OnProgress(kDummyExtensionId, |
image_writer_api::STAGE_WRITE, |
_)).Times(AnyNumber()); |
@@ -48,7 +49,7 @@ TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitions) { |
operation->Start(); |
- loop.RunUntilIdle(); |
+ loop.Run(); |
#if defined(OS_LINUX) && !defined(OS_CHROMEOS) |
scoped_ptr<char[]> image_data(new char[kPartitionTableSize]); |