chrome/browser/sync_file_system/local/syncable_file_operation_runner_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/local/syncable_file_operation_runner_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 <string>	5 #include <string>

6	6

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

8 #include "base/file_util.h"

9 #include "base/files/file.h"	8 #include "base/files/file.h"

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

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

11 #include "base/memory/scoped_ptr.h"	11 #include "base/memory/scoped_ptr.h"

12 #include "base/message_loop/message_loop.h"	12 #include "base/message_loop/message_loop.h"

13 #include "base/thread_task_runner_handle.h"	13 #include "base/thread_task_runner_handle.h"

14 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"	14 #include "chrome/browser/sync_file_system/local/canned_syncable_file_system.h"

15 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"	15 #include "chrome/browser/sync_file_system/local/local_file_change_tracker.h"

16 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"	16 #include "chrome/browser/sync_file_system/local/local_file_sync_context.h"

17 #include "chrome/browser/sync_file_system/local/local_file_sync_status.h"	17 #include "chrome/browser/sync_file_system/local/local_file_sync_status.h"

18 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"	18 #include "chrome/browser/sync_file_system/local/sync_file_system_backend.h"

19 #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h "	19 #include "chrome/browser/sync_file_system/local/syncable_file_operation_runner.h "

(...skipping 382 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
402 storage::FileSystemOperationRunner::OperationID id =	402 storage::FileSystemOperationRunner::OperationID id =

403 file_system_.operation_runner()->Truncate(	403 file_system_.operation_runner()->Truncate(

404 URL(kFile), 10, ExpectStatus(FROM_HERE, File::FILE_OK));	404 URL(kFile), 10, ExpectStatus(FROM_HERE, File::FILE_OK));

405 file_system_.operation_runner()->Cancel(	405 file_system_.operation_runner()->Cancel(

406 id, ExpectStatus(FROM_HERE, File::FILE_ERROR_INVALID_OPERATION));	406 id, ExpectStatus(FROM_HERE, File::FILE_ERROR_INVALID_OPERATION));

407 base::MessageLoop::current()->RunUntilIdle();	407 base::MessageLoop::current()->RunUntilIdle();

408 EXPECT_EQ(2, callback_count_);	408 EXPECT_EQ(2, callback_count_);

409 }	409 }

410	410

411 } // namespace sync_file_system	411 } // namespace sync_file_system

OLD	NEW