diff options
| author | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 13:11:17 +0000 |
|---|---|---|
| committer | kinuko@chromium.org <kinuko@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-12-10 13:11:17 +0000 |
| commit | 5488fc6e0576ebb107792d28ceac2493b85199da (patch) | |
| tree | 3a786bdf96971ab8dec1d09bba265ada79125d0a /webkit | |
| parent | f65b70b5cb06eed78f53ce5d25407d66dc38f246 (diff) | |
| download | chromium_src-5488fc6e0576ebb107792d28ceac2493b85199da.zip chromium_src-5488fc6e0576ebb107792d28ceac2493b85199da.tar.gz chromium_src-5488fc6e0576ebb107792d28ceac2493b85199da.tar.bz2 | |
Fix test-only leak in ExternalMountPoints
BUG=327280
Review URL: https://codereview.chromium.org/111513002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@239762 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/browser/fileapi/external_mount_points.cc | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/webkit/browser/fileapi/external_mount_points.cc b/webkit/browser/fileapi/external_mount_points.cc index 137db87..f196696 100644 --- a/webkit/browser/fileapi/external_mount_points.cc +++ b/webkit/browser/fileapi/external_mount_points.cc @@ -234,9 +234,15 @@ FileSystemURL ExternalMountPoints::CreateExternalFileSystemURL( } void ExternalMountPoints::RevokeAllFileSystems() { - base::AutoLock locker(lock_); - instance_map_.clear(); - path_to_name_map_.clear(); + NameToInstance instance_map_copy; + { + base::AutoLock locker(lock_); + instance_map_copy = instance_map_; + instance_map_.clear(); + path_to_name_map_.clear(); + } + STLDeleteContainerPairSecondPointers(instance_map_copy.begin(), + instance_map_copy.end()); } ExternalMountPoints::ExternalMountPoints() {} |