diff options
| author | davidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 00:50:15 +0000 |
|---|---|---|
| committer | davidroche@chromium.org <davidroche@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-25 00:50:15 +0000 |
| commit | e40d1b428004f3741a387cdb0fcf78bfad7cb2b9 (patch) | |
| tree | b1bc84763f7325c98cdb904a56a89f5583026557 | |
| parent | f36c9f69dd5e16a61a56e1410667ddf90bdcb20b (diff) | |
| download | chromium_src-e40d1b428004f3741a387cdb0fcf78bfad7cb2b9.zip chromium_src-e40d1b428004f3741a387cdb0fcf78bfad7cb2b9.tar.gz chromium_src-e40d1b428004f3741a387cdb0fcf78bfad7cb2b9.tar.bz2 | |
When a ValidatingConsumer completes, the DeviceOAuth2TokenService removes its pointer from the set of validating_consumers_ but doesn't delete the pointed-to object.
BUG=253434
Review URL: https://chromiumcodereview.appspot.com/17575015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@208330 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/chromeos/settings/device_oauth2_token_service.cc | 6 | ||||
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 6 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 6 |
3 files changed, 4 insertions, 14 deletions
diff --git a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc index d00264e..361d49e 100644 --- a/chrome/browser/chromeos/settings/device_oauth2_token_service.cc +++ b/chrome/browser/chromeos/settings/device_oauth2_token_service.cc @@ -236,10 +236,12 @@ void DeviceOAuth2TokenService::OnValidationComplete( refresh_token_is_valid_ = refresh_token_is_valid; std::set<ValidatingConsumer*>::iterator iter = pending_validators_->find( validator); - if (iter != pending_validators_->end()) + if (iter != pending_validators_->end()) { + delete *iter; pending_validators_->erase(iter); - else + } else { LOG(ERROR) << "OnValidationComplete called for unknown validator"; + } } // static diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index a9e6438..46f9add 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -946,9 +946,3 @@ fun:GetXWindowName fun:ash::test::DisplayControllerTest_XWidowNameForRootWindow_Test::TestBody } -{ - bug_253434 - Heapcheck:Leak - ... - fun:*DeviceOAuth2TokenServiceTest_RefreshTokenValidation_* -} diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 316fdd4..e9b2ea8 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -7315,9 +7315,3 @@ fun:_ZN7content15LevelDBDatabase4OpenERKN4base8FilePathEPKNS_17LevelDBComparatorEPb fun:_ZN7content12_GLOBAL__N_139LevelDBDatabaseTest_CorruptionTest_Test8TestBodyEv } -{ - bug_253434 - Memcheck:Leak - ... - fun:_ZN8chromeos*DeviceOAuth2TokenServiceTest_RefreshTokenValidation_*_Test8TestBodyEv -} |