chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc - Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: chrome/browser/sync_file_system/drive_backend/conflict_resolver_unittest.cc

Issue 486843004: Change base/file_utils.h includes to base/files/file_utils.h in chrome/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fix bad merge Created 6 years, 3 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 | « chrome/browser/sync/test/integration/sync_extension_helper.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/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"	13 #include "chrome/browser/drive/drive_uploader.h"

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

15 #include "chrome/browser/sync_file_system/drive_backend/drive_backend_constants. h"	15 #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"	16 #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"	17 #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"	18 #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"	19 #include "chrome/browser/sync_file_system/drive_backend/list_changes_task.h"

(...skipping 500 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
520	520

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

522	522

523 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());	523 EXPECT_EQ(SYNC_STATUS_OK, RunConflictResolver());

524	524

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

526 }	526 }

527	527

528 } // namespace drive_backend	528 } // namespace drive_backend

529 } // namespace sync_file_system	529 } // namespace sync_file_system

OLD	NEW