| 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 68a669aaad9a6ccf5856a346680ec9a337bc8371..4621285d4473df8829c1e4bb9f59545fb927353b 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,32 @@
|
|
|
| namespace extensions {
|
| namespace image_writer {
|
| +namespace {
|
|
|
| using testing::_;
|
| using testing::AnyNumber;
|
| using testing::AtLeast;
|
|
|
| -namespace {
|
| -
|
| class ImageWriterDestroyPartitionsOperationTest
|
| - : public ImageWriterUnitTestBase {
|
| -};
|
| + : public ImageWriterUnitTestBase {};
|
|
|
| -// Tests that the DestroyPartitionsOperation can successfully zero the first
|
| -// kPartitionTableSize bytes of an image.
|
| -TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitionsEndToEnd) {
|
| +TEST_F(ImageWriterDestroyPartitionsOperationTest, EndToEnd) {
|
| MockOperationManager manager;
|
| - base::RunLoop loop;
|
| + scoped_refptr<FakeImageWriterClient> client = FakeImageWriterClient::Create();
|
|
|
| scoped_refptr<DestroyPartitionsOperation> operation(
|
| new DestroyPartitionsOperation(manager.AsWeakPtr(),
|
| kDummyExtensionId,
|
| test_device_path_.AsUTF8Unsafe()));
|
|
|
| -#if defined(OS_LINUX) || defined(OS_CHROMEOS)
|
| +#if !defined(OS_CHROMEOS)
|
| + operation->SetUtilityClientForTesting(client);
|
| +#endif
|
| +
|
| + EXPECT_CALL(
|
| + manager,
|
| + OnProgress(kDummyExtensionId, image_writer_api::STAGE_VERIFYWRITE, _))
|
| + .Times(AnyNumber());
|
| EXPECT_CALL(manager, OnProgress(kDummyExtensionId,
|
| image_writer_api::STAGE_WRITE,
|
| _)).Times(AnyNumber());
|
| @@ -43,27 +46,18 @@ TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitionsEndToEnd) {
|
| .Times(AtLeast(1));
|
| EXPECT_CALL(manager, OnComplete(kDummyExtensionId)).Times(1);
|
| EXPECT_CALL(manager, OnError(kDummyExtensionId, _, _, _)).Times(0);
|
| -#else
|
| - EXPECT_CALL(manager, OnProgress(kDummyExtensionId, _, _)).Times(0);
|
| - EXPECT_CALL(manager, OnComplete(kDummyExtensionId)).Times(0);
|
| - EXPECT_CALL(manager, OnError(kDummyExtensionId,
|
| - _,
|
| - _,
|
| - error::kUnsupportedOperation)).Times(1);
|
| -#endif
|
|
|
| operation->Start();
|
|
|
| - loop.RunUntilIdle();
|
| + base::RunLoop().RunUntilIdle();
|
| +
|
| +#if !defined(OS_CHROMEOS)
|
| + client->Progress(0);
|
| + client->Progress(50);
|
| + client->Progress(100);
|
| + client->Success();
|
|
|
| -#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
|
| - scoped_ptr<char[]> image_data(new char[kPartitionTableSize]);
|
| - scoped_ptr<char[]> zeroes(new char[kPartitionTableSize]);
|
| - memset(zeroes.get(), 0, kPartitionTableSize);
|
| - ASSERT_EQ(kPartitionTableSize, base::ReadFile(test_device_path_,
|
| - image_data.get(),
|
| - kPartitionTableSize));
|
| - EXPECT_EQ(0, memcmp(image_data.get(), zeroes.get(), kPartitionTableSize));
|
| + base::RunLoop().RunUntilIdle();
|
| #endif
|
| }
|
|
|
|
|