chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 1190203002: Move (most of) chrome/browser/drive into components/drive/service.

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 1190203002: Move (most of) chrome/browser/drive into components/drive/service. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebasing... Created 5 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 | « chrome/browser/sync_file_system/drive_backend/conflict_resolver.cc ('k') | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »
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 84ffaf19e445a83aeda3bf7f3a4f62f6f225cf19..64dc3ec1869b51d9ca0577e1605be6d2fa746e78 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

@@ -10,8 +10,6 @@

#include "base/files/scoped_temp_dir.h"

#include "base/run_loop.h"

#include "base/thread_task_runner_handle.h"

-#include "chrome/browser/drive/drive_uploader.h"

-#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"

@@ -27,6 +25,8 @@

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

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

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

+#include "components/drive/drive_uploader.h"

+#include "components/drive/service/fake_drive_service.h"

#include "content/public/test/test_browser_thread_bundle.h"

#include "google_apis/drive/drive_api_error_codes.h"

#include "google_apis/drive/drive_api_parser.h"