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

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

Issue 382053004: Adds API test for imageWriterPrivate.writeFromFile (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixes memory leak. Created 6 years, 5 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/write_from_file_operation_unittest.cc
diff --git a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc
index 1de9533b8820ecc28cac7ca6e6b42aa43429659f..3346489711146a220ce9b92c7b73adbf2233c780 100644
--- a/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc
+++ b/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc
@@ -27,10 +27,10 @@ TEST_F(ImageWriterFromFileTest, InvalidFile) {
scoped_refptr<WriteFromFileOperation> op =
new WriteFromFileOperation(manager_.AsWeakPtr(),
kDummyExtensionId,
- test_image_path_,
- test_device_path_.AsUTF8Unsafe());
+ test_utils_.GetImagePath(),
+ test_utils_.GetDevicePath().AsUTF8Unsafe());
- base::DeleteFile(test_image_path_, false);
+ base::DeleteFile(test_utils_.GetImagePath(), false);
EXPECT_CALL(manager_, OnProgress(kDummyExtensionId, _, _)).Times(0);
EXPECT_CALL(manager_, OnComplete(kDummyExtensionId)).Times(0);
@@ -50,13 +50,8 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) {
scoped_refptr<WriteFromFileOperation> op =
new WriteFromFileOperation(manager_.AsWeakPtr(),
kDummyExtensionId,
- test_image_path_,
- test_device_path_.AsUTF8Unsafe());
-#if !defined(OS_CHROMEOS)
- scoped_refptr<FakeImageWriterClient> client = FakeImageWriterClient::Create();
- op->SetUtilityClientForTesting(client);
-#endif
-
+ test_utils_.GetImagePath(),
+ test_utils_.GetDevicePath().AsUTF8Unsafe());
EXPECT_CALL(manager_,
OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _))
.Times(AnyNumber());
@@ -90,15 +85,15 @@ TEST_F(ImageWriterFromFileTest, WriteFromFileEndToEnd) {
base::RunLoop().RunUntilIdle();
#if !defined(OS_CHROMEOS)
- client->Progress(0);
- client->Progress(50);
- client->Progress(100);
- client->Success();
+ test_utils_.GetUtilityClient()->Progress(0);
+ test_utils_.GetUtilityClient()->Progress(50);
+ test_utils_.GetUtilityClient()->Progress(100);
+ test_utils_.GetUtilityClient()->Success();
base::RunLoop().RunUntilIdle();
- client->Progress(0);
- client->Progress(50);
- client->Progress(100);
- client->Success();
+ test_utils_.GetUtilityClient()->Progress(0);
+ test_utils_.GetUtilityClient()->Progress(50);
+ test_utils_.GetUtilityClient()->Progress(100);
+ test_utils_.GetUtilityClient()->Success();
base::RunLoop().RunUntilIdle();
#endif
}

Powered by Google App Engine
This is Rietveld 408576698