Revert 272671 "Implementation of leveldb-backed PrefStore."

The CL broke asan/lsan bots on linux, and chromiumos e.g.

LevelDBPrefStoreTest.BasicObserver (run #1):
Direct leak of 8 byte(s) in 1 object(s) allocated from:
    #0 0x5babfb in operator new(unsigned long) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:55
    #1 0x61f3699 in LevelDBPrefStore::OnStorageRead(scoped_ptr\u003CLevelDBPrefStore::ReadingResults, base::DefaultDeleter\u003CLevelDBPrefStore::ReadingResults> >) chrome/browser/prefs/leveldb_pref_store.cc:406
    #2 0x61f2ea7 in LevelDBPrefStore::ReadPrefs() chrome/browser/prefs/leveldb_pref_store.cc:329
    #3 0x336efee in LevelDBPrefStoreTest_BasicObserver_Test::TestBody() chrome/browser/prefs/leveldb_pref_store_unittest.cc:97
...

Indirect leak of 4096 byte(s) in 1 object(s) allocated from:
    #0 0x5bad4b in operator new[](unsigned long) /usr/local/google/work/chromium/src/third_party/llvm/projects/compiler-rt/lib/asan/asan_new_delete.cc:57
    #1 0x7e66db5 in AllocateNewBlock third_party/leveldatabase/src/util/arena.cc:62
    #2 0x7e66db5 in leveldb::Arena::AllocateFallback(unsigned long) third_party/leveldatabase/src/util/arena.cc:33
    #3 0x7e2a88a in NewNode third_party/leveldatabase/src/db/skiplist.h:182
    #4 0x7e2a88a in leveldb::SkipList\u003Cchar const*, leveldb::MemTable::KeyComparator>::SkipList(leveldb::MemTable::KeyComparator, leveldb::Arena*) third_party/leveldatabase/src/db/skiplist.h:325
    #5 0x7e2a76e in leveldb::MemTable::MemTable(leveldb::InternalKeyComparator const&) third_party/leveldatabase/src/db/memtable.cc:24
    #6 0x7e084ce in leveldb::DBImpl::DBImpl(leveldb::Options const&, std::string const&) third_party/leveldatabase/src/db/db_impl.cc:120
    #7 0x7e1bfb0 in leveldb::DB::Open(leveldb::Options const&, std::string const&, leveldb::DB**) third_party/leveldatabase/src/db/db_impl.cc:1449
    #8 0x61ef0a2 in LevelDBPrefStore::OpenDB(base::FilePath const&, LevelDBPrefStore::ReadingResults*) chrome/browser/prefs/leveldb_pref_store.cc:113
    #9 0x61efcae in LevelDBPrefStore::DoReading(base::FilePath const&) chrome/browser/prefs/leveldb_pref_store.cc:158
    #10 0x61f2dc0 in LevelDBPrefStore::ReadPrefs() chrome/browser/prefs/leveldb_pref_store.cc:325
...

> Implementation of leveldb-backed PrefStore.
> 
> This is not hooked up yet, migration code from Json-backed stores is needed, among other things.
> 
> BUG=362814
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=271602
> 
> Review URL: https://codereview.chromium.org/169323003

TBR=dgrogan@chromium.org

Review URL: https://codereview.chromium.org/298043002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272700 0039d316-1c4b-4281-b951-d872f2087c98

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;

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
   };
 

chrome/browser/prefs/chrome_pref_service_factory.cc

@@ -313,8 +313,7 @@ void HandleReadError(PersistentPrefStore::PrefReadError error) {
     // an example problem that this can cause.
     // Do some diagnosis and try to avoid losing data.
     int message_id = 0;
-    if (error <= PersistentPrefStore::PREF_READ_ERROR_JSON_TYPE ||
-        error == PersistentPrefStore::PREF_READ_ERROR_LEVELDB_CORRUPTION) {
+    if (error <= PersistentPrefStore::PREF_READ_ERROR_JSON_TYPE) {
       message_id = IDS_PREFERENCES_CORRUPT_ERROR;
     } else if (error != PersistentPrefStore::PREF_READ_ERROR_NO_FILE) {
       message_id = IDS_PREFERENCES_UNREADABLE_ERROR;

chrome/browser/prefs/leveldb_pref_store.h

-// Copyright 2014 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef CHROME_BROWSER_PREFS_LEVELDB_PREF_STORE_H_
-#define CHROME_BROWSER_PREFS_LEVELDB_PREF_STORE_H_
-
-#include <set>
-#include <string>
-
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/files/file_path.h"
-#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop_proxy.h"
-#include "base/observer_list.h"
-#include "base/prefs/persistent_pref_store.h"
-#include "base/prefs/pref_value_map.h"
-#include "base/timer/timer.h"
-
-namespace base {
-class DictionaryValue;
-class SequencedTaskRunner;
-class Value;
-}
-
-namespace leveldb {
-class DB;
-}
-
-// A writable PrefStore implementation that is used for user preferences.
-class LevelDBPrefStore : public PersistentPrefStore {
- public:
-  // |sequenced_task_runner| is must be a shutdown-blocking task runner, ideally
-  // created by GetTaskRunnerForFile() method above.
-  LevelDBPrefStore(const base::FilePath& pref_filename,
-                   base::SequencedTaskRunner* sequenced_task_runner);
-
-  // PrefStore overrides:
-  virtual bool GetValue(const std::string& key,
-                        const base::Value** result) const OVERRIDE;
-  virtual void AddObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual void RemoveObserver(PrefStore::Observer* observer) OVERRIDE;
-  virtual bool HasObservers() const OVERRIDE;
-  virtual bool IsInitializationComplete() const OVERRIDE;
-
-  // PersistentPrefStore overrides:
-  virtual bool GetMutableValue(const std::string& key,
-                               base::Value** result) OVERRIDE;
-  // Takes ownership of value.
-  virtual void SetValue(const std::string& key, base::Value* value) OVERRIDE;
-  virtual void SetValueSilently(const std::string& key,
-                                base::Value* value) OVERRIDE;
-  virtual void RemoveValue(const std::string& key) OVERRIDE;
-  virtual bool ReadOnly() const OVERRIDE;
-  virtual PrefReadError GetReadError() const OVERRIDE;
-  virtual PrefReadError ReadPrefs() OVERRIDE;
-  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
-  virtual void CommitPendingWrite() OVERRIDE;
-  virtual void ReportValueChanged(const std::string& key) OVERRIDE;
-
- private:
-  struct ReadingResults;
-  class FileThreadSerializer;
-
-  virtual ~LevelDBPrefStore();
-
-  static scoped_ptr<ReadingResults> DoReading(const base::FilePath& path);
-  static void OpenDB(const base::FilePath& path,
-                     ReadingResults* reading_results);
-  void OnStorageRead(scoped_ptr<ReadingResults> reading_results);
-
-  void PersistFromUIThread();
-  void RemoveFromUIThread(const std::string& key);
-  void ScheduleWrite();
-
-  void SetValueInternal(const std::string& key,
-                        base::Value* value,
-                        bool notify);
-  void NotifyObservers(const std::string& key);
-  void MarkForInsertion(const std::string& key, const std::string& value);
-  void MarkForDeletion(const std::string& key);
-
-  base::FilePath path_;
-
-  const scoped_refptr<base::SequencedTaskRunner> sequenced_task_runner_;
-  const scoped_refptr<base::SequencedTaskRunner> original_task_runner_;
-
-  PrefValueMap prefs_;
-
-  bool read_only_;
-
-  ObserverList<PrefStore::Observer, true> observers_;
-
-  scoped_ptr<ReadErrorDelegate> error_delegate_;
-
-  bool initialized_;
-  PrefReadError read_error_;
-
-  // This object is created on the UI thread right after preferences are loaded
-  // from disk. A message to delete it is sent to the FILE thread by
-  // ~LevelDBPrefStore.
-  scoped_ptr<FileThreadSerializer> serializer_;
-
-  // Changes are accumulated in |keys_to_delete_| and |keys_to_set_| and are
-  // stored in the database according to |timer_|.
-  std::set<std::string> keys_to_delete_;
-  std::map<std::string, std::string> keys_to_set_;
-  base::OneShotTimer<LevelDBPrefStore> timer_;
-
-  base::WeakPtrFactory<LevelDBPrefStore> weak_ptr_factory_;
-
-  DISALLOW_COPY_AND_ASSIGN(LevelDBPrefStore);
-};
-
-#endif  // CHROME_BROWSER_PREFS_LEVELDB_PREF_STORE_H_

chrome/chrome_browser.gypi

@@ -1568,8 +1568,6 @@
         'browser/prefs/incognito_mode_prefs.h',
         'browser/prefs/interceptable_pref_filter.cc',
         'browser/prefs/interceptable_pref_filter.h',
-        'browser/prefs/leveldb_pref_store.cc',
-        'browser/prefs/leveldb_pref_store.h',
         'browser/prefs/pref_hash_calculator.cc',
         'browser/prefs/pref_hash_calculator.h',
         'browser/prefs/pref_hash_filter.cc',

chrome/chrome_tests_unit.gypi

@@ -1161,7 +1161,6 @@
         'browser/prefs/chrome_pref_service_unittest.cc',
         'browser/prefs/command_line_pref_store_unittest.cc',
         'browser/prefs/incognito_mode_prefs_unittest.cc',
-        'browser/prefs/leveldb_pref_store_unittest.cc',
         'browser/prefs/pref_hash_calculator_unittest.cc',
         'browser/prefs/pref_hash_filter_unittest.cc',
         'browser/prefs/pref_hash_store_impl_unittest.cc',

chrome/test/data/prefs/corrupted_leveldb/CURRENT

-MANIFEST-000007
\ No newline at end of file

tools/metrics/histograms/histograms.xml

@@ -9046,14 +9046,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   </summary>
 </histogram>
 
-<histogram name="LevelDBPrefStore.ReadErrors" enum="LevelDBPrefStoreErrorCodes">
-  <owner>dgrogan@chromium.org</owner>
-  <summary>
-    Bitfield that indicates errors and recovery that occurred when opening a
-    LevelDB preferences database.
-  </summary>
-</histogram>
-
 <histogram name="LibraryLoader.NativeLibraryHack" enum="BooleanUsage">
   <owner>feng@chromium.org</owner>
   <summary>
@@ -37453,36 +37445,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <int value="20" label="GetChildren"/>
 </enum>
 
-<enum name="LevelDBPrefStoreErrorCodes" type="int">
-  <int value="1" label="OPENED"/>
-  <int value="5" label="REPAIRED | OPENED"/>
-  <int value="6" label="REPAIRED | DESTROYED"/>
-  <int value="7" label="REPAIRED | DESTROYED | OPENED"/>
-  <int value="12" label="REPAIRED | DESTROY_FAILED"/>
-  <int value="18" label="REPAIR_FAILED | DESTROYED"/>
-  <int value="19" label="REPAIR_FAILED | DESTROYED | OPENED"/>
-  <int value="24" label="REPAIR_FAILED | DESTROY_FAILED"/>
-  <int value="32" label="IO_ERROR"/>
-  <int value="36" label="REPAIRED | IO_ERROR"/>
-  <int value="38" label="REPAIRED | DESTROYED | IO_ERROR"/>
-  <int value="50" label="REPAIR_FAILED | DESTROYED | IO_ERROR"/>
-  <int value="65" label="OPENED | DATA_LOST"/>
-  <int value="69" label="REPAIRED | OPENED | DATA_LOST"/>
-  <int value="71" label="REPAIRED | DESTROYED | OPENED | DATA_LOST"/>
-  <int value="83" label="REPAIR_FAILED | DESTROYED | OPENED | DATA_LOST"/>
-  <int value="129" label="OPENED | ITER_NOT_OK"/>
-  <int value="133" label="REPAIRED | OPENED | ITER_NOT_OK"/>
-  <int value="135" label="REPAIRED | DESTROYED | OPENED | ITER_NOT_OK"/>
-  <int value="147" label="REPAIR_FAILED | DESTROYED | OPENED | ITER_NOT_OK"/>
-  <int value="193" label="OPENED | DATA_LOST | ITER_NOT_OK"/>
-  <int value="197" label="REPAIRED | OPENED | DATA_LOST | ITER_NOT_OK"/>
-  <int value="199"
-      label="REPAIRED | DESTROYED | OPENED | DATA_LOST | ITER_NOT_OK"/>
-  <int value="211"
-      label="REPAIR_FAILED | DESTROYED | OPENED | DATA_LOST | ITER_NOT_OK"/>
-  <int value="256" label="FILE_NOT_SPECIFIED"/>
-</enum>
-
 <enum name="LinkMonitorFailureType" type="int">
   <int value="0" label="Local MAC Address Not Found"/>
   <int value="1" label="Client Startup Failure"/>