summaryrefslogtreecommitdiffstats
path: root/base/prefs
diff options
context:
space:
mode:
authorasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 08:18:59 +0000
committerasvitkine@chromium.org <asvitkine@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-20 08:18:59 +0000
commit633098129a191b5573d7d23e7bdab8eb746bf5cc (patch)
tree5865a5b500a4467bed631855e63ccda02492b271 /base/prefs
parent3b89eef9d7ecb2bffe65250fb99e741fb56abe66 (diff)
downloadchromium_src-633098129a191b5573d7d23e7bdab8eb746bf5cc.zip
chromium_src-633098129a191b5573d7d23e7bdab8eb746bf5cc.tar.gz
chromium_src-633098129a191b5573d7d23e7bdab8eb746bf5cc.tar.bz2
Revert 271602 "Implementation of leveldb-backed PrefStore."
Caused failure: LevelDBPrefStoreTest.GetMutableValue (run #1): [ RUN ] LevelDBPrefStoreTest.GetMutableValue Received signal 11 SEGV_MAPERR 000000000008 #0 0x00000345595e base::debug::StackTrace::StackTrace() #1 0x000003455b78 base::debug::(anonymous namespace)::StackDumpSignalHandler() #2 0x7f22d6faccb0 \u003Cunknown> #3 0x000003473e6b base::JSONWriter::BuildJSONString() #4 0x000003474aca base::JSONWriter::WriteWithOptions() #5 0x0000028861d1 Serialize() #6 0x000002888b6e LevelDBPrefStore::ReportValueChanged() #7 0x0000016af06d LevelDBPrefStoreTest_GetMutableValue_Test::TestBody() http://build.chromium.org/p/chromium.chromiumos/builders/Linux%20ChromiumOS%20Tests%20%281%29/builds/43483/steps/unit_tests/logs/GetMutableValue > Implementation of leveldb-backed PrefStore. > > This is not hooked up yet, migration code from Json-backed stores is needed, among other things. > > BUG=362814 > > Review URL: https://codereview.chromium.org/169323003 TBR=dgrogan@chromium.org Review URL: https://codereview.chromium.org/290633013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@271611 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/prefs')
-rw-r--r--base/prefs/json_pref_store.cc5
-rw-r--r--base/prefs/persistent_pref_store.h3
2 files changed, 0 insertions, 8 deletions
diff --git a/base/prefs/json_pref_store.cc b/base/prefs/json_pref_store.cc
index a6c2362..e99d64f 100644
--- a/base/prefs/json_pref_store.cc
+++ b/base/prefs/json_pref_store.cc
@@ -330,11 +330,6 @@ void JsonPrefStore::OnFileRead(scoped_ptr<base::Value> value,
// operation itself.
NOTREACHED();
break;
- case PREF_READ_ERROR_LEVELDB_IO:
- case PREF_READ_ERROR_LEVELDB_CORRUPTION_READ_ONLY:
- case PREF_READ_ERROR_LEVELDB_CORRUPTION:
- // These are specific to LevelDBPrefStore.
- NOTREACHED();
case PREF_READ_ERROR_MAX_ENUM:
NOTREACHED();
break;
diff --git a/base/prefs/persistent_pref_store.h b/base/prefs/persistent_pref_store.h
index 11d2a54..177d860 100644
--- a/base/prefs/persistent_pref_store.h
+++ b/base/prefs/persistent_pref_store.h
@@ -33,9 +33,6 @@ class BASE_PREFS_EXPORT PersistentPrefStore : public WriteablePrefStore {
// Indicates that ReadPrefs() couldn't complete synchronously and is waiting
// for an asynchronous task to complete first.
PREF_READ_ERROR_ASYNCHRONOUS_TASK_INCOMPLETE = 10,
- PREF_READ_ERROR_LEVELDB_IO = 11,
- PREF_READ_ERROR_LEVELDB_CORRUPTION_READ_ONLY = 12,
- PREF_READ_ERROR_LEVELDB_CORRUPTION = 13,
PREF_READ_ERROR_MAX_ENUM
};