diff options
| author | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 18:38:32 +0000 |
|---|---|---|
| committer | danakj@chromium.org <danakj@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-23 18:38:32 +0000 |
| commit | 7e5b5b0e5ff9bc17ebc0ef09db5a31bb238b834c (patch) | |
| tree | eef89cb4ac516d287b6aabef6ce1d34eea9bd12b /chrome/service | |
| parent | 5bcdd99d8b00c6e727e63fb0c3ecb8c02879accf (diff) | |
| download | chromium_src-7e5b5b0e5ff9bc17ebc0ef09db5a31bb238b834c.zip chromium_src-7e5b5b0e5ff9bc17ebc0ef09db5a31bb238b834c.tar.gz chromium_src-7e5b5b0e5ff9bc17ebc0ef09db5a31bb238b834c.tar.bz2 | |
Revert 242382 "Fix a race condition in preference metric reporting."
This broke android causing test crashes:
http://build.chromium.org/p/chromium.linux/builders/Android%20Tests%20%28dbg%29/builds/17336/steps/chromiumtestshell_instrumentation_tests/logs/stdio
http://chromegw.corp.google.com/i/clank.tot/builders/instrumentation-yakju-clankium-tot/builds/21056/steps/Run%20stack%20tool%20with%20logcat%20dump/logs/stdio
> Fix a race condition in preference metric reporting.
>
> Introduces:
> - PrefFilter: An interface to intercept preference values as they are loaded from disk, before any changes are possible.
> - PrefHashFilter: An implementation that verifies preference values against hashes in a PrefHashStore.
> - PrefHashStore(Impl): An interface and implementation for storing and verifying hashes of preferences.
> - PrefHashCalculator: A utility for calculating preference value hashes.
>
> TBR=brettw (base/base.gyp), scottbyer (chrome/service/service_process_prefs.cc)
> BUG=321680
> NOTRY=True
>
> Review URL: https://codereview.chromium.org/90563003
TBR=erikwright@chromium.org
Review URL: https://codereview.chromium.org/120803002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@242388 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/service')
| -rw-r--r-- | chrome/service/service_process_prefs.cc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/chrome/service/service_process_prefs.cc b/chrome/service/service_process_prefs.cc index d923185..c628a0b 100644 --- a/chrome/service/service_process_prefs.cc +++ b/chrome/service/service_process_prefs.cc @@ -5,15 +5,12 @@ #include "chrome/service/service_process_prefs.h" #include "base/message_loop/message_loop_proxy.h" -#include "base/prefs/pref_filter.h" #include "base/values.h" ServiceProcessPrefs::ServiceProcessPrefs( const base::FilePath& pref_filename, base::SequencedTaskRunner* task_runner) - : prefs_(new JsonPrefStore(pref_filename, - task_runner, - scoped_ptr<PrefFilter>())) { + : prefs_(new JsonPrefStore(pref_filename, task_runner)) { } ServiceProcessPrefs::~ServiceProcessPrefs() {} |