chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js - Issue 286203007: [SyncFS] Drop manual conflict resolution policy support.

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: chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js

Issue 286203007: [SyncFS] Drop manual conflict resolution policy support. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: drop more unused Created 6 years, 7 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 | « chrome/test/data/extensions/api_test/sync_file_system/conflict_resolution_policy/test.js ('k') | chrome/test/data/extensions/api_test/sync_file_system/get_file_statuses/test.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js

diff --git a/chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js b/chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js

index 4ad1e4c4b4f2f92dfe868d5f8684e6633745e2c1..3ec32f4c4f0eddf663a04022bc806741c8e4dbae 100644

--- a/chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js

+++ b/chrome/test/data/extensions/api_test/sync_file_system/get_file_status/test.js

@@ -11,12 +11,12 @@ var testStep = [

fileSystem.root.getFile('Test.txt', {create: true}, testStep.shift(),

errorHandler);

- // Confirm file is conflicting as this is the mocked value.

+ // Confirm file is pending as this is the mocked value.

function(fileEntry) {

chrome.syncFileSystem.getFileStatus(fileEntry, testStep.shift());

function(fileStatus) {

- chrome.test.assertEq("conflicting", fileStatus);

+ chrome.test.assertEq("pending", fileStatus);

chrome.test.succeed();

}

];