Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(120)

Unified Diff: chrome/browser/extensions/api/image_writer_private/destroy_partitions_operation_unittest.cc

Issue 170123002: Revert of Significantly cleans up the ImageWriter Operation class and subclasses. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..2b0fb93d9808582a14d86a3f3d62d41b81b8e56c 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
@@ -12,7 +12,6 @@
using testing::_;
using testing::AnyNumber;
-using testing::AtLeast;
namespace {
@@ -22,7 +21,7 @@
// Tests that the DestroyPartitionsOperation can successfully zero the first
// kPartitionTableSize bytes of an image.
-TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitionsEndToEnd) {
+TEST_F(ImageWriterDestroyPartitionsOperationTest, DestroyPartitions) {
MockOperationManager manager;
base::RunLoop loop;
@@ -32,15 +31,10 @@
test_device_path_.AsUTF8Unsafe()));
#if defined(OS_LINUX) || defined(OS_CHROMEOS)
+ EXPECT_CALL(manager, OnProgress(kDummyExtensionId, _, _)).Times(0);
EXPECT_CALL(manager, OnProgress(kDummyExtensionId,
image_writer_api::STAGE_WRITE,
_)).Times(AnyNumber());
- EXPECT_CALL(manager,
- OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, 0))
- .Times(AtLeast(1));
- EXPECT_CALL(manager,
- OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, 100))
- .Times(AtLeast(1));
EXPECT_CALL(manager, OnComplete(kDummyExtensionId)).Times(1);
EXPECT_CALL(manager, OnError(kDummyExtensionId, _, _, _)).Times(0);
#else

Powered by Google App Engine
This is Rietveld 408576698