diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-07 14:15:36 +0000 |
| commit | 2c5c9d596ad422529c88b47db2b60eff9410cde0 (patch) | |
| tree | 0625f8f8cb92d6c5ec93efb6892beb13bc6a43bb /chrome/browser/browsing_data_remover.h | |
| parent | 4ba14e1044e2e837a8c81894df156e4fd4be86bd (diff) | |
| download | chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.zip chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.gz chromium_src-2c5c9d596ad422529c88b47db2b60eff9410cde0.tar.bz2 | |
Reverts a commit that caused ASAN failures, and 2 dependent commits.
The primary commit was 113249, the dependents were 113261, 113263.
This is a speculative revert, r113249 is by far the likeliest culprit in the blamelist of build http://build.chromium.org/p/chromium.memory/builders/ASAN%20Tests%20%282%29/builds/2325 which is where we started seeing the ASAN failures in question, will un-revert if it does not fix the problem.
TBR=jhawkins@chromium.org
BUG=none
Review URL: http://codereview.chromium.org/8832006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113387 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/browsing_data_remover.h')
| -rw-r--r-- | chrome/browser/browsing_data_remover.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/browsing_data_remover.h b/chrome/browser/browsing_data_remover.h index 10f9061..385ecaa 100644 --- a/chrome/browser/browsing_data_remover.h +++ b/chrome/browser/browsing_data_remover.h @@ -229,7 +229,7 @@ class BrowsingDataRemover : public content::NotificationObserver, static bool removing_; // Used to delete data from the HTTP caches. - net::CompletionCallback cache_callback_; + net::OldCompletionCallbackImpl<BrowsingDataRemover> cache_callback_; CacheState next_cache_state_; disk_cache::Backend* cache_; |