chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 108343009: [SyncFS] Move FakeDriveServiceHelper from V1 directory to V2.

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/drive_backend/conflict_resolver_unittest.cc

Issue 108343009: [SyncFS] Move FakeDriveServiceHelper from V1 directory to V2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 | « no previous file | chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h » ('j') | chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

diff --git a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

index d600381c1d9255d40c38c8495b4305bc378ca9a7..2aebbb1aafc3025cab8959abd82bb71d10b2f0c2 100644

--- a/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

+++ b/chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

@@ -13,13 +13,13 @@

#include "chrome/browser/drive/fake_drive_service.h"

#include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants.h"

#include "chrome/browser/sync_file_system/drive_backend/drive_backend_test_util.h"

+#include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helper.h"

#include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"

#include "chrome/browser/sync_file_system/drive_backend/local_to_remote_syncer.h"

#include "chrome/browser/sync_file_system/drive_backend/metadata_database.h"

#include "chrome/browser/sync_file_system/drive_backend/remote_to_local_syncer.h"

#include "chrome/browser/sync_file_system/drive_backend/sync_engine_context.h"

#include "chrome/browser/sync_file_system/drive_backend/sync_engine_initializer.h"

-#include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_helper.h"

#include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_uploader.h"

#include "chrome/browser/sync_file_system/fake_remote_change_processor.h"

#include "chrome/browser/sync_file_system/sync_file_system_test_util.h"