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

Side by Side 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: rebase 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « no previous file | chrome/browser/sync_file_system/drive_backend/drive_backend_sync_unittest.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2013 The Chromium Authors. All rights reserved.	1 // Copyright 2013 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"	5 #include "chrome/browser/sync_file_system/drive_backend/conflict_resolver.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/callback.h"	8 #include "base/callback.h"

9 #include "base/file_util.h"	9 #include "base/file_util.h"

10 #include "base/files/scoped_temp_dir.h"	10 #include "base/files/scoped_temp_dir.h"

11 #include "base/run_loop.h"	11 #include "base/run_loop.h"

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

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

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

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

	16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_service_helpe r.h"

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

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

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

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

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

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

22 #include "chrome/browser/sync_file_system/drive_backend_v1/fake_drive_service_he lper.h"

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

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

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

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

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

28 #include "google_apis/drive/gdata_errorcode.h"	28 #include "google_apis/drive/gdata_errorcode.h"

29 #include "testing/gtest/include/gtest/gtest.h"	29 #include "testing/gtest/include/gtest/gtest.h"

30	30

31 namespace sync_file_system {	31 namespace sync_file_system {

32 namespace drive_backend {	32 namespace drive_backend {

(...skipping 470 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
503	503

504 EXPECT_EQ(4, CountParents(file));	504 EXPECT_EQ(4, CountParents(file));

505	505

506 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());	506 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());

507	507

508 EXPECT_EQ(1, CountParents(file));	508 EXPECT_EQ(1, CountParents(file));

509 }	509 }

510	510

511 } // namespace drive_backend	511 } // namespace drive_backend

512 } // namespace sync_file_system	512 } // namespace sync_file_system

OLD	NEW