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

Side by Side 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 unified diff | 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 »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/files/file_util.h"	9 #include "base/files/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 "base/thread_task_runner_handle.h"	12 #include "base/thread_task_runner_handle.h"

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

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

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

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

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

18 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h"	16 #include "chrome/browser/sync_file_system/drive_backend/fake_drive_uploader.h"

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

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

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

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

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

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

25 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"	23 #include "chrome/browser/sync_file_system/drive_backend/sync_task_manager.h"

26 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"	24 #include "chrome/browser/sync_file_system/drive_backend/sync_task_token.h"

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

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

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

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

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

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

31 #include "google_apis/drive/drive_api_error_codes.h"	31 #include "google_apis/drive/drive_api_error_codes.h"

32 #include "google_apis/drive/drive_api_parser.h"	32 #include "google_apis/drive/drive_api_parser.h"

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

34 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"	34 #include "third_party/leveldatabase/src/helpers/memenv/memenv.h"

35 #include "third_party/leveldatabase/src/include/leveldb/env.h"	35 #include "third_party/leveldatabase/src/include/leveldb/env.h"

36	36

37 namespace sync_file_system {	37 namespace sync_file_system {

38 namespace drive_backend {	38 namespace drive_backend {

39	39

(...skipping 479 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
519	519

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

521	521

522 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());	522 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());

523	523

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

525 }	525 }

526	526

527 } // namespace drive_backend	527 } // namespace drive_backend

528 } // namespace sync_file_system	528 } // namespace sync_file_system

OLD	NEW