chrome/browser/extensions/api/push_messaging/sync_setup_helper.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/push_messaging/sync_setup_helper.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/preferences_private/preferences_private_apitest.cc ('k') | chrome/browser/extensions/api/storage/managed_value_store_cache.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 (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 "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h"	5 #include "chrome/browser/extensions/api/push_messaging/sync_setup_helper.h"

6	6

7 #include <vector>	7 #include <vector>

8	8

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

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"	11 #include "chrome/browser/bookmarks/bookmark_model_factory.h"

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

13 #include "chrome/browser/history/history_service_factory.h"	13 #include "chrome/browser/history/history_service_factory.h"

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

15 #include "chrome/browser/profiles/profile_manager.h"	15 #include "chrome/browser/profiles/profile_manager.h"

16 #include "chrome/browser/search_engines/template_url_service_factory.h"	16 #include "chrome/browser/search_engines/template_url_service_factory.h"

17 #include "chrome/browser/sync/profile_sync_service.h"	17 #include "chrome/browser/sync/profile_sync_service.h"

18 #include "chrome/browser/sync/profile_sync_service_factory.h"	18 #include "chrome/browser/sync/profile_sync_service_factory.h"

19 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"	19 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h"

(...skipping 54 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
74 return true;	74 return true;

75 }	75 }

76	76

77 bool SyncSetupHelper::AwaitQuiescence() {	77 bool SyncSetupHelper::AwaitQuiescence() {

78 std::vector<ProfileSyncServiceHarness*> clients;	78 std::vector<ProfileSyncServiceHarness*> clients;

79 clients.push_back(client_.get());	79 clients.push_back(client_.get());

80 return ProfileSyncServiceHarness::AwaitQuiescence(clients);	80 return ProfileSyncServiceHarness::AwaitQuiescence(clients);

81 }	81 }

82	82

83 } // namespace extensions	83 } // namespace extensions

OLD	NEW