chrome/browser/chromeos/drive/file_system/copy_operation_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/file_system/copy_operation_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/chromeos/drive/file_system.cc ('k') | chrome/browser/chromeos/drive/file_system/create_file_operation.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/chromeos/drive/file_system/copy_operation.h"	5 #include "chrome/browser/chromeos/drive/file_system/copy_operation.h"

6	6

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

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

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

10 #include "chrome/browser/chromeos/drive/file_change.h"	10 #include "chrome/browser/chromeos/drive/file_change.h"

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

12 #include "chrome/browser/chromeos/drive/file_system_util.h"	12 #include "chrome/browser/chromeos/drive/file_system_util.h"

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

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

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

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

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

(...skipping 491 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
509 pending_callback.Run(FILE_ERROR_OK);	509 pending_callback.Run(FILE_ERROR_OK);

510 content::RunAllBlockingPoolTasksUntilIdle();	510 content::RunAllBlockingPoolTasksUntilIdle();

511	511

512 EXPECT_EQ(FILE_ERROR_OK, copy_error);	512 EXPECT_EQ(FILE_ERROR_OK, copy_error);

513 ResourceEntry entry;	513 ResourceEntry entry;

514 EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &entry));	514 EXPECT_EQ(FILE_ERROR_OK, GetLocalResourceEntry(dest_path, &entry));

515 }	515 }

516	516

517 } // namespace file_system	517 } // namespace file_system

518 } // namespace drive	518 } // namespace drive

OLD	NEW