diff options
| author | rdsmith <rdsmith@chromium.org> | 2015-05-29 08:01:30 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-05-29 15:01:50 +0000 |
| commit | d6ee164bd88916df1c65eeee3a9ecc508246e625 (patch) | |
| tree | 983671e185fd478df51b69e87d82386b3a7a834c /net/sdch/sdch_owner.h | |
| parent | 8593e1698184b2ec3146b90212bad54e38b03217 (diff) | |
| download | chromium_src-d6ee164bd88916df1c65eeee3a9ecc508246e625.zip chromium_src-d6ee164bd88916df1c65eeee3a9ecc508246e625.tar.gz chromium_src-d6ee164bd88916df1c65eeee3a9ecc508246e625.tar.bz2 | |
Revert debugging put in place for issue 454198.
BUG=454198
R=ellyjones@chromium.org
Review URL: https://codereview.chromium.org/1150143004
Cr-Commit-Position: refs/heads/master@{#331969}
Diffstat (limited to 'net/sdch/sdch_owner.h')
| -rw-r--r-- | net/sdch/sdch_owner.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/net/sdch/sdch_owner.h b/net/sdch/sdch_owner.h index ec5d82d..3d6b59b 100644 --- a/net/sdch/sdch_owner.h +++ b/net/sdch/sdch_owner.h @@ -10,7 +10,6 @@ #include "base/memory/memory_pressure_listener.h" #include "base/memory/ref_counted.h" -#include "base/memory/weak_ptr.h" #include "base/prefs/pref_store.h" #include "net/base/sdch_observer.h" #include "net/url_request/sdch_dictionary_fetcher.h" @@ -162,9 +161,8 @@ class NET_EXPORT SdchOwner : public SdchObserver, public PrefStore::Observer { size_t size, int use_count, DictionaryFate fate); - // For investigation of http://crbug.com/454198; remove when resolved. - base::WeakPtr<SdchManager> manager_; - scoped_ptr<SdchDictionaryFetcher> fetcher_; + net::SdchManager* manager_; + scoped_ptr<net::SdchDictionaryFetcher> fetcher_; size_t total_dictionary_bytes_; @@ -173,11 +171,6 @@ class NET_EXPORT SdchOwner : public SdchObserver, public PrefStore::Observer { size_t max_total_dictionary_size_; size_t min_space_for_dictionary_fetch_; -#if defined(OS_CHROMEOS) - // For debugging http://crbug.com/454198; remove when resolved. - unsigned int destroyed_; -#endif - base::MemoryPressureListener memory_pressure_listener_; // Dictionary persistence machinery. |