chrome/browser/extensions/api/file_system/file_system_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/extensions/api/file_system/file_system_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, 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/extensions/api/file_system/file_system_api.cc ('k') | chrome/browser/extensions/api/i18n/i18n_apitest.cc » ('j') | no next file with comments »

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 "apps/saved_files_service.h"	5 #include "apps/saved_files_service.h"

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

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

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

9 #include "build/build_config.h"	9 #include "build/build_config.h"

10 #include "chrome/browser/apps/app_browsertest_util.h"	10 #include "chrome/browser/apps/app_browsertest_util.h"

11 #include "chrome/browser/extensions/api/file_system/file_system_api.h"	11 #include "chrome/browser/extensions/api/file_system/file_system_api.h"

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

13 #include "chrome/common/chrome_paths.h"	13 #include "chrome/common/chrome_paths.h"

14 #include "extensions/browser/extension_prefs.h"	14 #include "extensions/browser/extension_prefs.h"

15 #include "extensions/browser/extension_registry.h"	15 #include "extensions/browser/extension_registry.h"

16 #include "extensions/browser/extension_registry_observer.h"	16 #include "extensions/browser/extension_registry_observer.h"

(...skipping 611 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
628 AppLoadObserver observer(profile(),	628 AppLoadObserver observer(profile(),

629 base::Bind(AddSavedEntry,	629 base::Bind(AddSavedEntry,

630 test_directory,	630 test_directory,

631 true,	631 true,

632 apps::SavedFilesService::Get(profile())));	632 apps::SavedFilesService::Get(profile())));

633 ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/restore_directory"))	633 ASSERT_TRUE(RunPlatformAppTest("api_test/file_system/restore_directory"))

634 << message_;	634 << message_;

635 }	635 }

636	636

637 } // namespace extensions	637 } // namespace extensions

OLD	NEW