chrome/browser/chromeos/file_manager/external_filesystem_apitest.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/file_manager/external_filesystem_apitest.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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 "base/bind.h"	5 #include "base/bind.h"

6 #include "base/file_util.h"

7 #include "base/files/file_path.h"	6 #include "base/files/file_path.h"

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

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

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

10 #include "chrome/browser/browser_process.h"	10 #include "chrome/browser/browser_process.h"

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

12 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"	12 #include "chrome/browser/chromeos/file_manager/drive_test_util.h"

13 #include "chrome/browser/chromeos/file_manager/volume_manager.h"	13 #include "chrome/browser/chromeos/file_manager/volume_manager.h"

14 #include "chrome/browser/chromeos/profiles/profile_helper.h"	14 #include "chrome/browser/chromeos/profiles/profile_helper.h"

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

16 #include "chrome/browser/extensions/extension_apitest.h"	16 #include "chrome/browser/extensions/extension_apitest.h"

17 #include "chrome/browser/profiles/profile.h"	17 #include "chrome/browser/profiles/profile.h"

(...skipping 772 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
790 AppFileHandlerMulti) {	790 AppFileHandlerMulti) {

791 EXPECT_TRUE(	791 EXPECT_TRUE(

792 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi",	792 RunFileSystemExtensionApiTest("file_browser/app_file_handler_multi",

793 FILE_PATH_LITERAL("manifest.json"),	793 FILE_PATH_LITERAL("manifest.json"),

794 "",	794 "",

795 FLAGS_NONE))	795 FLAGS_NONE))

796 << message_;	796 << message_;

797 }	797 }

798 } // namespace	798 } // namespace

799 } // namespace file_manager	799 } // namespace file_manager

OLD	NEW