summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 21:45:06 +0000
committerpenghuang@chromium.org <penghuang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-04 21:45:06 +0000
commitc618f3efa7adcd04ccd04065bd01771dc1ef153c (patch)
tree613c8303199ac09f654366e9c739b707395826b5
parent4e721741ebb5f584d23483bf1f5577dea2539f3c (diff)
downloadchromium_src-c618f3efa7adcd04ccd04065bd01771dc1ef153c.zip
chromium_src-c618f3efa7adcd04ccd04065bd01771dc1ef153c.tar.gz
chromium_src-c618f3efa7adcd04ccd04065bd01771dc1ef153c.tar.bz2
Fix a heapcheck issue in pref_service_syncable
BUG=90271,155530,171571 Review URL: https://chromiumcodereview.appspot.com/12095089 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180530 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/prefs/pref_service_syncable.cc2
-rw-r--r--tools/heapcheck/suppressions.txt37
2 files changed, 1 insertions, 38 deletions
diff --git a/chrome/browser/prefs/pref_service_syncable.cc b/chrome/browser/prefs/pref_service_syncable.cc
index 9e13ff1d..3ec590e 100644
--- a/chrome/browser/prefs/pref_service_syncable.cc
+++ b/chrome/browser/prefs/pref_service_syncable.cc
@@ -25,7 +25,7 @@ namespace {
// type.
Value* CreateLocaleDefaultValue(base::Value::Type type,
int message_id) {
- const std::string& resource_string = l10n_util::GetStringUTF8(message_id);
+ const std::string resource_string = l10n_util::GetStringUTF8(message_id);
DCHECK(!resource_string.empty());
switch (type) {
case Value::TYPE_BOOLEAN: {
diff --git a/tools/heapcheck/suppressions.txt b/tools/heapcheck/suppressions.txt
index dd3422f4..3d55a7a 100644
--- a/tools/heapcheck/suppressions.txt
+++ b/tools/heapcheck/suppressions.txt
@@ -849,14 +849,6 @@
fun:MakeRequest
}
{
- bug_90271
- Heapcheck:Leak
- ...
- fun:::CreateLocaleDefaultValue
- fun:PrefService::RegisterLocalizedStringPref
- fun:TabContentsWrapper::RegisterUserPrefs
-}
-{
bug_90369_a
Heapcheck:Leak
fun:std::string::_Rep::_S_create
@@ -1514,14 +1506,6 @@
fun:GeolocationInfoBarQueueControllerTests_OneObservationPerInfoBarCancelled_Test::TestBody
}
{
- bug_155530_b
- Heapcheck:Leak
- ...
- fun:::CreateLocaleDefaultValue
- ...
- fun:GeolocationInfoBarQueueControllerTests::SetUp
-}
-{
bug_157885
Heapcheck:Leak
...
@@ -1751,27 +1735,6 @@
fun:ManagedUserServiceTest_ExtensionManagementPolicyProvider_Test::TestBody
}
{
- bug_171571_a
- Heapcheck:Leak
- fun:std::basic_string::_Rep::_S_create
- fun:base::PrepareForUTF8Output
- fun:UTF16ToUTF8
- fun:UTF16ToUTF8
- fun:l10n_util::GetStringUTF8
- fun:::CreateLocaleDefaultValue
- fun:PrefServiceSyncable::RegisterLocalizedStringPref
- fun:PrefsTabHelper::RegisterUserPrefs
- fun:chrome::RegisterUserPrefs
- fun:TestingProfile::CreateTestingPrefService
- fun:TestingProfile::GetPrefs
- fun:ProfileKeyedBaseFactory::RegisterUserPrefsOnProfile
- fun:ProfileDependencyManager::CreateProfileServices
- fun:TestingProfile::Init
- fun:TestingProfile::TestingProfile
- fun:ChromeRenderViewHostTestHarness::SetUp
- fun:GeolocationPermissionContextTests::SetUp
-}
-{
bug_172077
Heapcheck:Leak
...