Commit 8780606b authored by thestig@chromium.org's avatar thestig@chromium.org

Valgrind/Heapchecker: Fix leak from r149099.

BUG=none
TEST=none
TBR=kmadhusu
Review URL: https://chromiumcodereview.appspot.com/10829095

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@149130 0039d316-1c4b-4281-b951-d872f2087c98
parent 17262e6e
...@@ -4,6 +4,8 @@ ...@@ -4,6 +4,8 @@
#include "chrome/browser/chromeos/disks/mock_disk_mount_manager.h" #include "chrome/browser/chromeos/disks/mock_disk_mount_manager.h"
#include <utility>
#include "base/message_loop.h" #include "base/message_loop.h"
#include "base/stl_util.h" #include "base/stl_util.h"
#include "base/string_util.h" #include "base/string_util.h"
...@@ -173,8 +175,13 @@ void MockDiskMountManager::CreateDiskEntryForMountDevice( ...@@ -173,8 +175,13 @@ void MockDiskMountManager::CreateDiskEntryForMountDevice(
true, // has_media true, // has_media
false, // on_boot_device false, // on_boot_device
false); // is_hidden false); // is_hidden
disks_.insert(std::pair<std::string, DiskMountManager::Disk*>( DiskMountManager::DiskMap::iterator it = disks_.find(mount_info.source_path);
std::string(mount_info.source_path), disk)); if (it == disks_.end()) {
disks_.insert(std::make_pair(std::string(mount_info.source_path), disk));
} else {
delete it->second;
it->second = disk;
}
} }
void MockDiskMountManager::RemoveDiskEntryForMountDevice( void MockDiskMountManager::RemoveDiskEntryForMountDevice(
...@@ -186,9 +193,9 @@ void MockDiskMountManager::RemoveDiskEntryForMountDevice( ...@@ -186,9 +193,9 @@ void MockDiskMountManager::RemoveDiskEntryForMountDevice(
} }
} }
void MockDiskMountManager::NotifyDiskChanged(DiskMountManagerEventType event, void MockDiskMountManager::NotifyDiskChanged(
const DiskMountManager::Disk* disk) DiskMountManagerEventType event,
{ const DiskMountManager::Disk* disk) {
// Make sure we run on UI thread. // Make sure we run on UI thread.
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment