chrome/browser/sync_file_system/sync_file_system_service_unittest.cc - Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

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/browser/sync_file_system/sync_file_system_service_unittest.cc

Issue 492873002: Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix chromeos build Created 6 years, 4 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/browser/sync_file_system/sync_file_system_service.cc ('k') | chrome/browser/sync_file_system/sync_file_system_test_util.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

diff --git a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

index bf29b65bb0331d6b72c30a95437d4ea2f3960b5e..6a2047690d203c54b14800dbb5b91cc1f9e64efa 100644

--- a/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

+++ b/chrome/browser/sync_file_system/sync_file_system_service_unittest.cc

@@ -34,8 +34,8 @@

#include "webkit/browser/fileapi/file_system_context.h"

using content::BrowserThread;

-using fileapi::FileSystemURL;

-using fileapi::FileSystemURLSet;

+using storage::FileSystemURL;

+using storage::FileSystemURLSet;

using ::testing::AnyNumber;

using ::testing::AtLeast;

using ::testing::InSequence;

@@ -91,7 +91,7 @@ class MockSyncEventObserver : public SyncEventObserver {

SyncServiceState state,

const std::string& description));

MOCK_METHOD4(OnFileSynced,

- void(const fileapi::FileSystemURL& url,

+ void(const storage::FileSystemURL& url,

SyncFileStatus status,

SyncAction action,

SyncDirection direction));