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

reverts 97997 as it was only needed with this debugging code.

I'm TBRing this as it's just a revert (well, two reverts).

BUG=91396
TEST=none
R=brettw@chromium.org,mnissler@chromium.org,ben@chromium.org
TBR=brettw@chromium.org,mnissler@chromium.org,ben@chromium.org

Review URL: http://codereview.chromium.org/7714038

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

5 files changed, 22 insertions, 49 deletions

diff --git a/chrome/browser/prefs/incognito_user_pref_store.cc b/chrome/browser/prefs/incognito_user_pref_store.cc
index d1240fd..87bcb2c 100644
--- a/chrome/browser/prefs/incognito_user_pref_store.cc
+++ b/chrome/browser/prefs/incognito_user_pref_store.cc
@@ -134,9 +134,6 @@ void IncognitoUserPrefStore::ReportValueChanged(const std::string& key) {
   FOR_EACH_OBSERVER(PrefStore::Observer, observers_, OnPrefValueChanged(key));
 }
 
-void IncognitoUserPrefStore::CheckIfValueDestroyed(const std::string& key) {
-}
-
 void IncognitoUserPrefStore::OnPrefValueChanged(const std::string& key) {
   if (!overlay_.GetValue(key, NULL))
     ReportValueChanged(key);
diff --git a/chrome/browser/prefs/incognito_user_pref_store.h b/chrome/browser/prefs/incognito_user_pref_store.h
index 38a7a59..b5be17e 100644
--- a/chrome/browser/prefs/incognito_user_pref_store.h
+++ b/chrome/browser/prefs/incognito_user_pref_store.h
@@ -9,7 +9,6 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
 #include "base/observer_list.h"
 #include "chrome/browser/prefs/pref_value_map.h"
@@ -39,19 +38,17 @@ class IncognitoUserPrefStore : public PersistentPrefStore,
 
   // Methods of PersistentPrefStore.
   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* 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* delegate);
+  virtual bool WritePrefs();
+  virtual void ScheduleWritePrefs();
+  virtual void CommitPendingWrite();
+  virtual void ReportValueChanged(const std::string& key);
 
  private:
   // Methods of PrefStore::Observer.
diff --git a/chrome/browser/prefs/pref_service.cc b/chrome/browser/prefs/pref_service.cc
index 3f76755..6cb9836 100644
--- a/chrome/browser/prefs/pref_service.cc
+++ b/chrome/browser/prefs/pref_service.cc
@@ -838,20 +838,6 @@ SyncableService* PrefService::GetSyncableService() {
   return pref_sync_associator_.get();
 }
 
-void PrefService::CheckIfValueDestroyed(const char* path,
-                                        base::Value::Type type) {
-  // Make sure the value exists.
-  Value* value = GetMutableUserPref(path, type);
-  if (!value) {
-    const Preference* pref = FindPreference(path);
-    CHECK(pref);
-    CHECK_EQ(type, pref->GetType());
-    CHECK(false);
-  }
-
-  user_pref_store_->CheckIfValueDestroyed(path);
-}
-
 ///////////////////////////////////////////////////////////////////////////////
 // PrefService::Preference
 
diff --git a/chrome/browser/prefs/pref_service.h b/chrome/browser/prefs/pref_service.h
index a357a6e..5361928 100644
--- a/chrome/browser/prefs/pref_service.h
+++ b/chrome/browser/prefs/pref_service.h
@@ -293,11 +293,6 @@ class PrefService : public base::NonThreadSafe {
   // TODO(zea): Have PrefService implement SyncableService directly.
   SyncableService* GetSyncableService();
 
-  // TODO(sky): remove this. It's used in tracking 91396.
-  // Used for debugging. Crashes if the value at |path| is deleted out from
-  // under us.
-  void CheckIfValueDestroyed(const char* path, base::Value::Type type);
-
  protected:
   // Construct a new pref service, specifying the pref sources as explicit
   // PrefStore pointers. This constructor is what CreatePrefService() ends up
diff --git a/chrome/browser/prefs/testing_pref_store.h b/chrome/browser/prefs/testing_pref_store.h
index 94fbe2f..106b836 100644
--- a/chrome/browser/prefs/testing_pref_store.h
+++ b/chrome/browser/prefs/testing_pref_store.h
@@ -29,19 +29,17 @@ class TestingPrefStore : public PersistentPrefStore {
 
   // PersistentPrefStore overrides:
   virtual ReadResult GetMutableValue(const std::string& key,
-                                     base::Value** result) OVERRIDE;
-  virtual void ReportValueChanged(const std::string& key) 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 PersistentPrefStore::PrefReadError ReadPrefs() OVERRIDE;
-  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate) OVERRIDE;
-  virtual bool WritePrefs() OVERRIDE;
-  virtual void ScheduleWritePrefs() OVERRIDE {}
-  virtual void CommitPendingWrite() OVERRIDE {}
-  virtual void CheckIfValueDestroyed(const std::string& key) OVERRIDE {}
+                                     base::Value** result);
+  virtual void ReportValueChanged(const std::string& key);
+  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 PersistentPrefStore::PrefReadError ReadPrefs();
+  virtual void ReadPrefsAsync(ReadErrorDelegate* error_delegate);
+  virtual bool WritePrefs();
+  virtual void ScheduleWritePrefs() {}
+  virtual void CommitPendingWrite() {}
 
   // Marks the store as having completed initialization.
   void SetInitializationCompleted();