chrome/browser/chromeos/drive/sync/entry_update_performer_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/chromeos/drive/sync/entry_update_performer_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

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/chromeos/drive/sync/entry_update_performer.h"	5 #include "chrome/browser/chromeos/drive/sync/entry_update_performer.h"

6	6

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

8 #include "base/file_util.h"	8 #include "base/files/file_util.h"

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

10 #include "base/task_runner_util.h"	10 #include "base/task_runner_util.h"

11 #include "chrome/browser/chromeos/drive/file_cache.h"	11 #include "chrome/browser/chromeos/drive/file_cache.h"

12 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"	12 #include "chrome/browser/chromeos/drive/file_system/download_operation.h"

13 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"	13 #include "chrome/browser/chromeos/drive/file_system/operation_test_base.h"

14 #include "chrome/browser/chromeos/drive/job_scheduler.h"	14 #include "chrome/browser/chromeos/drive/job_scheduler.h"

15 #include "chrome/browser/chromeos/drive/resource_metadata.h"	15 #include "chrome/browser/chromeos/drive/resource_metadata.h"

16 #include "chrome/browser/drive/drive_api_util.h"	16 #include "chrome/browser/drive/drive_api_util.h"

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

18 #include "content/public/test/test_utils.h"	18 #include "content/public/test/test_utils.h"

(...skipping 570 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
589	589

590 // This should result in reverting the local change.	590 // This should result in reverting the local change.

591 ResourceEntry result_entry;	591 ResourceEntry result_entry;

592 EXPECT_EQ(FILE_ERROR_OK,	592 EXPECT_EQ(FILE_ERROR_OK,

593 GetLocalResourceEntryById(src_entry.local_id(), &result_entry));	593 GetLocalResourceEntryById(src_entry.local_id(), &result_entry));

594 EXPECT_EQ(src_entry.title(), result_entry.title());	594 EXPECT_EQ(src_entry.title(), result_entry.title());

595 }	595 }

596	596

597 } // namespace internal	597 } // namespace internal

598 } // namespace drive	598 } // namespace drive

OLD	NEW