Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Side by Side Diff: chrome/browser/prefs/profile_pref_store_manager.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
OLDNEW
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 "chrome/browser/prefs/profile_pref_store_manager.h" 5 #include "chrome/browser/prefs/profile_pref_store_manager.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/json/json_file_value_serializer.h" 10 #include "base/json/json_file_value_serializer.h"
11 #include "base/logging.h" 11 #include "base/logging.h"
12 #include "base/metrics/histogram.h" 12 #include "base/metrics/histogram.h"
13 #include "base/prefs/json_pref_store.h" 13 #include "base/prefs/json_pref_store.h"
14 #include "base/prefs/persistent_pref_store.h" 14 #include "base/prefs/persistent_pref_store.h"
15 #include "base/prefs/pref_registry_simple.h" 15 #include "base/prefs/pref_registry_simple.h"
16 #include "chrome/browser/prefs/pref_hash_store_impl.h" 16 #include "chrome/browser/prefs/pref_hash_store_impl.h"
17 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h" 17 #include "chrome/browser/prefs/tracked/pref_service_hash_store_contents.h"
18 #include "chrome/browser/prefs/tracked/segregated_pref_store.h" 18 #include "chrome/browser/prefs/tracked/segregated_pref_store.h"
19 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h" 19 #include "chrome/browser/prefs/tracked/tracked_preferences_migration.h"
(...skipping 206 matching lines...) Expand 10 before | Expand all | Expand 10 after
226 226
227 scoped_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore( 227 scoped_ptr<PrefHashStore> ProfilePrefStoreManager::GetPrefHashStore(
228 bool use_super_mac) { 228 bool use_super_mac) {
229 DCHECK(kPlatformSupportsPreferenceTracking); 229 DCHECK(kPlatformSupportsPreferenceTracking);
230 230
231 return scoped_ptr<PrefHashStore>(new PrefHashStoreImpl( 231 return scoped_ptr<PrefHashStore>(new PrefHashStoreImpl(
232 seed_, 232 seed_,
233 device_id_, 233 device_id_,
234 use_super_mac)); 234 use_super_mac));
235 } 235 }
OLDNEW
« no previous file with comments | « chrome/browser/prefs/pref_service_browsertest.cc ('k') | chrome/browser/prefs/profile_pref_store_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698