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

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

Issue 10384047: Revert 135222 - it broke multiprofile tests - Use worker pool for IO in JsonPrefStore. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 7 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 | « no previous file | chrome/common/important_file_writer.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/pref_service.h" 5 #include "chrome/browser/prefs/pref_service.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <string> 8 #include <string>
9 9
10 #include "base/bind.h" 10 #include "base/bind.h"
11 #include "base/command_line.h" 11 #include "base/command_line.h"
12 #include "base/file_path.h" 12 #include "base/file_path.h"
13 #include "base/file_util.h" 13 #include "base/file_util.h"
14 #include "base/logging.h" 14 #include "base/logging.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/metrics/histogram.h" 16 #include "base/metrics/histogram.h"
17 #include "base/stl_util.h" 17 #include "base/stl_util.h"
18 #include "base/string_number_conversions.h" 18 #include "base/string_number_conversions.h"
19 #include "base/string_util.h" 19 #include "base/string_util.h"
20 #include "base/threading/sequenced_worker_pool.h"
21 #include "base/value_conversions.h" 20 #include "base/value_conversions.h"
22 #include "build/build_config.h" 21 #include "build/build_config.h"
23 #include "chrome/browser/browser_process.h" 22 #include "chrome/browser/browser_process.h"
24 #include "chrome/browser/extensions/extension_pref_store.h" 23 #include "chrome/browser/extensions/extension_pref_store.h"
25 #include "chrome/browser/policy/configuration_policy_pref_store.h" 24 #include "chrome/browser/policy/configuration_policy_pref_store.h"
26 #include "chrome/browser/prefs/command_line_pref_store.h" 25 #include "chrome/browser/prefs/command_line_pref_store.h"
27 #include "chrome/browser/prefs/default_pref_store.h" 26 #include "chrome/browser/prefs/default_pref_store.h"
28 #include "chrome/browser/prefs/overlay_user_pref_store.h" 27 #include "chrome/browser/prefs/overlay_user_pref_store.h"
29 #include "chrome/browser/prefs/pref_model_associator.h" 28 #include "chrome/browser/prefs/pref_model_associator.h"
30 #include "chrome/browser/prefs/pref_notifier_impl.h" 29 #include "chrome/browser/prefs/pref_notifier_impl.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore(); 138 ConfigurationPolicyPrefStore::CreateMandatoryPolicyPrefStore();
140 ConfigurationPolicyPrefStore* recommended = 139 ConfigurationPolicyPrefStore* recommended =
141 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore(); 140 ConfigurationPolicyPrefStore::CreateRecommendedPolicyPrefStore();
142 #else 141 #else
143 ConfigurationPolicyPrefStore* managed = NULL; 142 ConfigurationPolicyPrefStore* managed = NULL;
144 ConfigurationPolicyPrefStore* recommended = NULL; 143 ConfigurationPolicyPrefStore* recommended = NULL;
145 #endif // ENABLE_CONFIGURATION_POLICY 144 #endif // ENABLE_CONFIGURATION_POLICY
146 145
147 CommandLinePrefStore* command_line = 146 CommandLinePrefStore* command_line =
148 new CommandLinePrefStore(CommandLine::ForCurrentProcess()); 147 new CommandLinePrefStore(CommandLine::ForCurrentProcess());
149 scoped_refptr<base::SequencedTaskRunner> io_task_runner = 148 JsonPrefStore* user = new JsonPrefStore(
150 BrowserThread::GetBlockingPool()->GetSequencedTaskRunner( 149 pref_filename,
151 BrowserThread::GetBlockingPool()->GetSequenceToken()); 150 BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE));
152 JsonPrefStore* user = new JsonPrefStore(pref_filename, io_task_runner);
153 DefaultPrefStore* default_pref_store = new DefaultPrefStore(); 151 DefaultPrefStore* default_pref_store = new DefaultPrefStore();
154 152
155 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl(); 153 PrefNotifierImpl* pref_notifier = new PrefNotifierImpl();
156 PrefModelAssociator* pref_sync_associator = new PrefModelAssociator(); 154 PrefModelAssociator* pref_sync_associator = new PrefModelAssociator();
157 155
158 return new PrefService( 156 return new PrefService(
159 pref_notifier, 157 pref_notifier,
160 new PrefValueStore( 158 new PrefValueStore(
161 managed, 159 managed,
162 extension_prefs, 160 extension_prefs,
(...skipping 819 matching lines...) Expand 10 before | Expand all | Expand 10 after
982 return pref_value_store()->PrefValueFromDefaultStore(name_.c_str()); 980 return pref_value_store()->PrefValueFromDefaultStore(name_.c_str());
983 } 981 }
984 982
985 bool PrefService::Preference::IsUserModifiable() const { 983 bool PrefService::Preference::IsUserModifiable() const {
986 return pref_value_store()->PrefValueUserModifiable(name_.c_str()); 984 return pref_value_store()->PrefValueUserModifiable(name_.c_str());
987 } 985 }
988 986
989 bool PrefService::Preference::IsExtensionModifiable() const { 987 bool PrefService::Preference::IsExtensionModifiable() const {
990 return pref_value_store()->PrefValueExtensionModifiable(name_.c_str()); 988 return pref_value_store()->PrefValueExtensionModifiable(name_.c_str());
991 } 989 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/important_file_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698