Reverts debugging code added in hopes of tracking crash. This also

chrome/common/json_pref_store.h

 // Copyright (c) 2011 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_COMMON_JSON_PREF_STORE_H_
 #define CHROME_COMMON_JSON_PREF_STORE_H_
 #pragma once
 
 #include <string>
 
@@ skipping 24 matching lines @@
 
   // PrefStore overrides:
   virtual ReadResult GetValue(const std::string& key,
                               const base::Value** result) const;
   virtual void AddObserver(PrefStore::Observer* observer);
   virtual void RemoveObserver(PrefStore::Observer* observer);
   virtual bool IsInitializationComplete() const;
 
   // PersistentPrefStore overrides:
   virtual ReadResult GetMutableValue(const std::string& key,
-                                     base::Value** result) OVERRIDE;
-  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 ReadPrefs() OVERRIDE;
-  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
-  virtual bool WritePrefs() OVERRIDE;
-  virtual void ScheduleWritePrefs() OVERRIDE;
-  virtual void CommitPendingWrite() OVERRIDE;
-  virtual void ReportValueChanged(const std::string& key) OVERRIDE;
-  virtual void CheckIfValueDestroyed(const std::string& key) OVERRIDE;
+                                     base::Value** result);
+  virtual void SetValue(const std::string& key, base::Value* value);
+  virtual void SetValueSilently(const std::string& key, base::Value* value);
+  virtual void RemoveValue(const std::string& key);
+  virtual bool ReadOnly() const;
+  virtual PrefReadError ReadPrefs();
+  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate);
+  virtual bool WritePrefs();
+  virtual void ScheduleWritePrefs();
+  virtual void CommitPendingWrite();
+  virtual void ReportValueChanged(const std::string& key);
 
   // This method is called after JSON file has been read. Method takes
   // ownership of the |value| pointer. Note, this method is used with
   // asynchronous file reading, so class exposes it only for the internal needs.
   // (read: do not call it manually).
   void OnFileRead(base::Value* value_owned, PrefReadError error, bool no_dir);
 
  private:
-  enum SetValueType {
-    // Indicates observers should be notified of the change.
-    SET_VALUE_NOTIFY,
-
-    // Indicates observers should not be notified of the change.
-    SET_VALUE_DONT_NOTIFY
-  };
-
   // ImportantFileWriter::DataSerializer overrides:
   virtual bool SerializeData(std::string* output);
 
-  // Implementation of SetValue.
-  void SetValueImpl(const std::string& key,
-                    base::Value* value,
-                    SetValueType type);
-
-  static void ResetCheckIfValueDestroyed(base::Value* value);
-
   FilePath path_;
   scoped_refptr<base::MessageLoopProxy> file_message_loop_proxy_;
 
   scoped_ptr<base::DictionaryValue> prefs_;
 
   bool read_only_;
 
   // Helper for safely writing pref data.
   ImportantFileWriter writer_;
 
   ObserverList<PrefStore::Observer, true> observers_;
 
   scoped_ptr<ReadErrorDelegate> error_delegate_;
 
   bool initialized_;
 
   DISALLOW_COPY_AND_ASSIGN(JsonPrefStore);
 };
 
 #endif  // CHROME_COMMON_JSON_PREF_STORE_H_