summaryrefslogtreecommitdiffstats
path: root/chrome/service
diff options
context:
space:
mode:
authorsergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 21:25:20 +0000
committersergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-05-07 21:25:20 +0000
commit370bc7307374542078512971c25efe6047ed88e2 (patch)
treee41a14b6504bec3c873601a75db10430a42ba3ca /chrome/service
parentcfcc491b55d8ce9526711bc9ea5c05d423cf6605 (diff)
downloadchromium_src-370bc7307374542078512971c25efe6047ed88e2.zip
chromium_src-370bc7307374542078512971c25efe6047ed88e2.tar.gz
chromium_src-370bc7307374542078512971c25efe6047ed88e2.tar.bz2
Revert 135222 - it broke multiprofile tests - Use worker pool for IO in JsonPrefStore.
Review URL: https://chromiumcodereview.appspot.com/10344007 TBR=sergeyu@chromium.org Review URL: https://chromiumcodereview.appspot.com/10384047 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135723 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
-rw-r--r--chrome/service/service_process_prefs.cc4
-rw-r--r--chrome/service/service_process_prefs.h4
2 files changed, 4 insertions, 4 deletions
diff --git a/chrome/service/service_process_prefs.cc b/chrome/service/service_process_prefs.cc
index e259e2c..511709a 100644
--- a/chrome/service/service_process_prefs.cc
+++ b/chrome/service/service_process_prefs.cc
@@ -8,8 +8,8 @@
ServiceProcessPrefs::ServiceProcessPrefs(
const FilePath& pref_filename,
- base::SequencedTaskRunner* blocking_task_runner)
- : prefs_(new JsonPrefStore(pref_filename, blocking_task_runner)) {
+ base::MessageLoopProxy* file_message_loop_proxy)
+ : prefs_(new JsonPrefStore(pref_filename, file_message_loop_proxy)) {
}
ServiceProcessPrefs::~ServiceProcessPrefs() {}
diff --git a/chrome/service/service_process_prefs.h b/chrome/service/service_process_prefs.h
index 7bc4c4b..e5aecde 100644
--- a/chrome/service/service_process_prefs.h
+++ b/chrome/service/service_process_prefs.h
@@ -12,7 +12,7 @@
namespace base {
class DictionaryValue;
-} // namespace base
+}
// Manages persistent preferences for the service process. This is basically a
// thin wrapper around JsonPrefStore for more comfortable use.
@@ -21,7 +21,7 @@ class ServiceProcessPrefs {
// |file_message_loop_proxy| is the MessageLoopProxy for a thread on which
// file I/O can be done.
ServiceProcessPrefs(const FilePath& pref_filename,
- base::SequencedTaskRunner* blocking_task_runner);
+ base::MessageLoopProxy* file_message_loop_proxy);
~ServiceProcessPrefs();
// Read preferences from the backing file.