diff options
| -rw-r--r-- | tools/heapcheck/suppressions.txt | 10 | ||||
| -rw-r--r-- | webkit/chromeos/fileapi/cros_mount_point_provider.cc | 7 |
2 files changed, 9 insertions, 8 deletions
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt index 790fefa..51ecd31 100644 --- a/tools/heapcheck/suppressions.txt +++ b/tools/heapcheck/suppressions.txt @@ -1628,10 +1628,10 @@ fun:void DispatchToMethod } { - bug_ + bug_97814 Heapcheck:Leak - ... - fun:base::ScopedCallbackFactory::NewCallback - fun:fileapi::FileSystemPathManagerTest::GetRootPath - fun:fileapi::FileSystemPathManagerTest_* + fun:base::Value::CreateIntegerValue + fun:base::FundamentalValue::DeepCopy + fun:ExtensionContentSettingsStore::GetEffectiveContentSetting + fun:ExtensionContentSettingsStoreTest_* } diff --git a/webkit/chromeos/fileapi/cros_mount_point_provider.cc b/webkit/chromeos/fileapi/cros_mount_point_provider.cc index 55b574a..678d706 100644 --- a/webkit/chromeos/fileapi/cros_mount_point_provider.cc +++ b/webkit/chromeos/fileapi/cros_mount_point_provider.cc @@ -1,4 +1,4 @@ - // Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -84,14 +84,15 @@ void CrosMountPointProvider::ValidateFileSystemRootAndGetURL( const GURL& origin_url, fileapi::FileSystemType type, bool create, - fileapi::FileSystemPathManager::GetRootPathCallback* callback_ptr) { + fileapi::FileSystemPathManager::GetRootPathCallback* callback) { DCHECK(type == fileapi::kFileSystemTypeExternal); std::string name(GetOriginIdentifierFromURL(origin_url)); name += ':'; name += fileapi::kExternalName; FilePath root_path; root_path = FilePath(fileapi::kExternalDir); - callback_ptr->Run(true, root_path, name); + callback->Run(true, root_path, name); + delete callback; } FilePath CrosMountPointProvider::ValidateFileSystemRootAndGetPathOnFileThread( |