chrome/browser/extensions/api/preferences_private/preferences_private_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/preferences_private/preferences_private_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

« no previous file with comments | « chrome/browser/extensions/api/page_capture/page_capture_api.cc ('k') | chrome/browser/extensions/api/push_messaging/sync_setup_helper.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 2014 The Chromium Authors. All rights reserved.	1 // Copyright 2014 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/basictypes.h"	5 #include "base/basictypes.h"

6 #include "base/bind.h"	6 #include "base/bind.h"

7 #include "base/bind_helpers.h"	7 #include "base/bind_helpers.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/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

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

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

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

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

15 #include "chrome/browser/extensions/api/preferences_private/preferences_private_ api.h"	15 #include "chrome/browser/extensions/api/preferences_private/preferences_private_ api.h"

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

17 #include "chrome/browser/extensions/extension_function_test_utils.h"	17 #include "chrome/browser/extensions/extension_function_test_utils.h"

18 #include "chrome/browser/extensions/extension_test_message_listener.h"	18 #include "chrome/browser/extensions/extension_test_message_listener.h"

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

(...skipping 171 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
191	191

192 // Verifies that we wait for the sync service to be ready before checking	192 // Verifies that we wait for the sync service to be ready before checking

193 // encryption status.	193 // encryption status.

194 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest,	194 IN_PROC_BROWSER_TEST_F(PreferencesPrivateApiTest,

195 GetSyncCategoriesWithoutPassphraseAsynchronous) {	195 GetSyncCategoriesWithoutPassphraseAsynchronous) {

196 service_->set_sync_initialized(false);	196 service_->set_sync_initialized(false);

197 TestGetSyncCategoriesWithoutPassphraseFunction();	197 TestGetSyncCategoriesWithoutPassphraseFunction();

198 }	198 }

199	199

200 } // namespace	200 } // namespace

OLD	NEW