trunk/src/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc - Issue 384513002: Revert 282130 "Adds API test for imageWriterPrivate.writeFromFile"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 384513002: Revert 282130 "Adds API test for imageWriterPrivate.writeFromFile" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: 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

« no previous file with comments | « trunk/src/chrome/browser/extensions/api/image_writer_private/test_utils.cc ('k') | trunk/src/chrome/browser/extensions/api/image_writer_private/write_from_url_operation_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: trunk/src/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc

===================================================================

--- trunk/src/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc (revision 282139)

+++ trunk/src/chrome/browser/extensions/api/image_writer_private/write_from_file_operation_unittest.cc (working copy)

@@ -27,10 +27,10 @@

scoped_refptr<WriteFromFileOperation> op =

new WriteFromFileOperation(manager_.AsWeakPtr(),

kDummyExtensionId,

- test_utils_.GetImagePath(),

- test_utils_.GetDevicePath().AsUTF8Unsafe());

+ test_image_path_,

+ test_device_path_.AsUTF8Unsafe());

- base::DeleteFile(test_utils_.GetImagePath(), false);

+ base::DeleteFile(test_image_path_, false);

EXPECT_CALL(manager_, OnProgress(kDummyExtensionId, _, _)).Times(0);

EXPECT_CALL(manager_, OnComplete(kDummyExtensionId)).Times(0);

@@ -50,8 +50,13 @@

scoped_refptr<WriteFromFileOperation> op =

new WriteFromFileOperation(manager_.AsWeakPtr(),

kDummyExtensionId,

- test_utils_.GetImagePath(),

- test_utils_.GetDevicePath().AsUTF8Unsafe());

+ test_image_path_,

+ test_device_path_.AsUTF8Unsafe());

+#if !defined(OS_CHROMEOS)

+ scoped_refptr<FakeImageWriterClient> client = FakeImageWriterClient::Create();

+ op->SetUtilityClientForTesting(client);

+#endif

EXPECT_CALL(manager_,

OnProgress(kDummyExtensionId, image_writer_api::STAGE_WRITE, _))

.Times(AnyNumber());

@@ -85,15 +90,15 @@

base::RunLoop().RunUntilIdle();

#if !defined(OS_CHROMEOS)

- test_utils_.GetUtilityClient()->Progress(0);

- test_utils_.GetUtilityClient()->Progress(50);

- test_utils_.GetUtilityClient()->Progress(100);

- test_utils_.GetUtilityClient()->Success();

+ client->Progress(0);

+ client->Progress(50);

+ client->Progress(100);

+ client->Success();

base::RunLoop().RunUntilIdle();

- test_utils_.GetUtilityClient()->Progress(0);

- test_utils_.GetUtilityClient()->Progress(50);

- test_utils_.GetUtilityClient()->Progress(100);

- test_utils_.GetUtilityClient()->Success();

+ client->Progress(0);

+ client->Progress(50);

+ client->Progress(100);

+ client->Success();

base::RunLoop().RunUntilIdle();

#endif

}