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

Side by Side Diff: chrome/browser/prefs/chrome_pref_service_factory.cc

Issue 90563003: Fix a race condition in preference metric reporting. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Tentative fix for test crashes. Created 7 years 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 (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/prefs/chrome_pref_service_factory.h" 5 #include "chrome/browser/prefs/chrome_pref_service_factory.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/files/file_path.h" 10 #include "base/files/file_path.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/prefs/default_pref_store.h" 12 #include "base/prefs/default_pref_store.h"
13 #include "base/prefs/json_pref_store.h" 13 #include "base/prefs/json_pref_store.h"
14 #include "base/prefs/pref_notifier_impl.h" 14 #include "base/prefs/pref_notifier_impl.h"
15 #include "base/prefs/pref_registry.h" 15 #include "base/prefs/pref_registry.h"
16 #include "base/prefs/pref_service.h" 16 #include "base/prefs/pref_service.h"
17 #include "base/prefs/pref_value_store.h" 17 #include "base/prefs/pref_value_store.h"
18 #include "chrome/browser/browser_process.h" 18 #include "chrome/browser/browser_process.h"
19 #include "chrome/browser/prefs/command_line_pref_store.h" 19 #include "chrome/browser/prefs/command_line_pref_store.h"
20 #include "chrome/browser/prefs/pref_hash_filter.h"
21 #include "chrome/browser/prefs/pref_hash_store.h"
20 #include "chrome/browser/prefs/pref_model_associator.h" 22 #include "chrome/browser/prefs/pref_model_associator.h"
21 #include "chrome/browser/prefs/pref_service_syncable.h" 23 #include "chrome/browser/prefs/pref_service_syncable.h"
22 #include "chrome/browser/prefs/pref_service_syncable_factory.h" 24 #include "chrome/browser/prefs/pref_service_syncable_factory.h"
23 #include "chrome/browser/ui/profile_error_dialog.h" 25 #include "chrome/browser/ui/profile_error_dialog.h"
24 #include "components/user_prefs/pref_registry_syncable.h" 26 #include "components/user_prefs/pref_registry_syncable.h"
25 #include "content/public/browser/browser_context.h" 27 #include "content/public/browser/browser_context.h"
26 #include "content/public/browser/browser_thread.h" 28 #include "content/public/browser/browser_thread.h"
27 #include "grit/chromium_strings.h" 29 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h" 30 #include "grit/generated_resources.h"
29 31
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 #endif 73 #endif
72 } 74 }
73 } 75 }
74 76
75 void PrepareBuilder( 77 void PrepareBuilder(
76 PrefServiceSyncableFactory* factory, 78 PrefServiceSyncableFactory* factory,
77 const base::FilePath& pref_filename, 79 const base::FilePath& pref_filename,
78 base::SequencedTaskRunner* pref_io_task_runner, 80 base::SequencedTaskRunner* pref_io_task_runner,
79 policy::PolicyService* policy_service, 81 policy::PolicyService* policy_service,
80 ManagedUserSettingsService* managed_user_settings, 82 ManagedUserSettingsService* managed_user_settings,
83 scoped_ptr<PrefHashStore> pref_hash_store,
81 const scoped_refptr<PrefStore>& extension_prefs, 84 const scoped_refptr<PrefStore>& extension_prefs,
82 bool async) { 85 bool async) {
83 #if defined(OS_LINUX) 86 #if defined(OS_LINUX)
84 // We'd like to see what fraction of our users have the preferences 87 // We'd like to see what fraction of our users have the preferences
85 // stored on a network file system, as we've had no end of troubles 88 // stored on a network file system, as we've had no end of troubles
86 // with NFS/AFS. 89 // with NFS/AFS.
87 // TODO(evanm): remove this once we've collected state. 90 // TODO(evanm): remove this once we've collected state.
88 file_util::FileSystemType fstype; 91 file_util::FileSystemType fstype;
89 if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) { 92 if (file_util::GetFileSystemType(pref_filename.DirName(), &fstype)) {
90 UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType", 93 UMA_HISTOGRAM_ENUMERATION("PrefService.FileSystemType",
(...skipping 22 matching lines...) Expand all
113 make_scoped_refptr(new SupervisedUserPrefStore(managed_user_settings))); 116 make_scoped_refptr(new SupervisedUserPrefStore(managed_user_settings)));
114 } 117 }
115 #endif 118 #endif
116 119
117 factory->set_async(async); 120 factory->set_async(async);
118 factory->set_extension_prefs(extension_prefs); 121 factory->set_extension_prefs(extension_prefs);
119 factory->set_command_line_prefs( 122 factory->set_command_line_prefs(
120 make_scoped_refptr( 123 make_scoped_refptr(
121 new CommandLinePrefStore(CommandLine::ForCurrentProcess()))); 124 new CommandLinePrefStore(CommandLine::ForCurrentProcess())));
122 factory->set_read_error_callback(base::Bind(&HandleReadError)); 125 factory->set_read_error_callback(base::Bind(&HandleReadError));
126 scoped_ptr<PrefFilter> pref_filter;
127 if (pref_hash_store)
128 pref_filter.reset(new PrefHashFilter(pref_hash_store.Pass()));
123 factory->set_user_prefs( 129 factory->set_user_prefs(
124 new JsonPrefStore(pref_filename, pref_io_task_runner)); 130 new JsonPrefStore(
131 pref_filename,
132 pref_io_task_runner,
133 pref_filter.Pass()));
125 } 134 }
126 135
127 } // namespace 136 } // namespace
128 137
129 namespace chrome_prefs { 138 namespace chrome_prefs {
130 139
131 scoped_ptr<PrefService> CreateLocalState( 140 scoped_ptr<PrefService> CreateLocalState(
132 const base::FilePath& pref_filename, 141 const base::FilePath& pref_filename,
133 base::SequencedTaskRunner* pref_io_task_runner, 142 base::SequencedTaskRunner* pref_io_task_runner,
134 policy::PolicyService* policy_service, 143 policy::PolicyService* policy_service,
135 const scoped_refptr<PrefRegistry>& pref_registry, 144 const scoped_refptr<PrefRegistry>& pref_registry,
136 bool async) { 145 bool async) {
137 PrefServiceSyncableFactory factory; 146 PrefServiceSyncableFactory factory;
138 PrepareBuilder(&factory, 147 PrepareBuilder(&factory,
139 pref_filename, 148 pref_filename,
140 pref_io_task_runner, 149 pref_io_task_runner,
141 policy_service, 150 policy_service,
142 NULL, 151 NULL,
152 scoped_ptr<PrefHashStore>(),
143 NULL, 153 NULL,
144 async); 154 async);
145 return factory.Create(pref_registry.get()); 155 return factory.Create(pref_registry.get());
146 } 156 }
147 157
148 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs( 158 scoped_ptr<PrefServiceSyncable> CreateProfilePrefs(
149 const base::FilePath& pref_filename, 159 const base::FilePath& pref_filename,
150 base::SequencedTaskRunner* pref_io_task_runner, 160 base::SequencedTaskRunner* pref_io_task_runner,
151 policy::PolicyService* policy_service, 161 policy::PolicyService* policy_service,
152 ManagedUserSettingsService* managed_user_settings, 162 ManagedUserSettingsService* managed_user_settings,
163 scoped_ptr<PrefHashStore> pref_hash_store,
153 const scoped_refptr<PrefStore>& extension_prefs, 164 const scoped_refptr<PrefStore>& extension_prefs,
154 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry, 165 const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
155 bool async) { 166 bool async) {
156 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs"); 167 TRACE_EVENT0("browser", "chrome_prefs::CreateProfilePrefs");
157 PrefServiceSyncableFactory factory; 168 PrefServiceSyncableFactory factory;
158 PrepareBuilder(&factory, 169 PrepareBuilder(&factory,
159 pref_filename, 170 pref_filename,
160 pref_io_task_runner, 171 pref_io_task_runner,
161 policy_service, 172 policy_service,
162 managed_user_settings, 173 managed_user_settings,
174 pref_hash_store.Pass(),
163 extension_prefs, 175 extension_prefs,
164 async); 176 async);
165 return factory.CreateSyncable(pref_registry.get()); 177 return factory.CreateSyncable(pref_registry.get());
166 } 178 }
167 179
168 } // namespace chrome_prefs 180 } // namespace chrome_prefs
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698