chrome/browser/chromeos/drive/file_system/get_file_for_saving_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/get_file_for_saving_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, 4 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/download_operation_unittest.cc ('k') | chrome/browser/chromeos/drive/file_system/open_file_operation_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/chromeos/drive/file_system/get_file_for_saving_operatio n.h"	5 #include "chrome/browser/chromeos/drive/file_system/get_file_for_saving_operatio n.h"

6	6

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

8 #include "base/file_util.h"

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

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

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

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

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

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

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

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

16 #include "chrome/browser/chromeos/drive/file_write_watcher.h"	16 #include "chrome/browser/chromeos/drive/file_write_watcher.h"

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

18 #include "google_apis/drive/test_util.h"	18 #include "google_apis/drive/test_util.h"

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

(...skipping 122 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
142 google_apis::test_util::CreateCopyResultCallback(	142 google_apis::test_util::CreateCopyResultCallback(

143 &error, &local_path, &entry));	143 &error, &local_path, &entry));

144 content::RunAllBlockingPoolTasksUntilIdle();	144 content::RunAllBlockingPoolTasksUntilIdle();

145	145

146 // Checks that an error is returned.	146 // Checks that an error is returned.

147 EXPECT_EQ(FILE_ERROR_EXISTS, error);	147 EXPECT_EQ(FILE_ERROR_EXISTS, error);

148 }	148 }

149	149

150 } // namespace file_system	150 } // namespace file_system

151 } // namespace drive	151 } // namespace drive

OLD	NEW