diff options
| author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 00:52:35 +0000 |
|---|---|---|
| committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-01 00:52:35 +0000 |
| commit | ddf421c3f57f11340ed8d263f3aa47513e5adb46 (patch) | |
| tree | 7a0112b4ee1f5cb9f5dbc3a91b5e29d099592f43 /chrome/browser/automation | |
| parent | 9f10ec33813708ec699c833f84a8b6a06bf7b20f (diff) | |
| download | chromium_src-ddf421c3f57f11340ed8d263f3aa47513e5adb46.zip chromium_src-ddf421c3f57f11340ed8d263f3aa47513e5adb46.tar.gz chromium_src-ddf421c3f57f11340ed8d263f3aa47513e5adb46.tar.bz2 | |
Change the PrefService::GetPreferenceValues() interface to return a scoped_ptr.
Fix leak of DictionaryValue in PrefsFunctionalTest.TestHaveLocalStatePrefs.
BUG=313722
TBR=bauerb@chromium.org, phajdan.jr@chromium.org
Review URL: https://codereview.chromium.org/46763006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@232255 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/automation')
| -rw-r--r-- | chrome/browser/automation/testing_automation_provider.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc index a84f27c..3592d6a 100644 --- a/chrome/browser/automation/testing_automation_provider.cc +++ b/chrome/browser/automation/testing_automation_provider.cc @@ -2782,10 +2782,10 @@ void TestingAutomationProvider::PerformActionOnSearchEngine( void TestingAutomationProvider::GetLocalStatePrefsInfo( DictionaryValue* args, IPC::Message* reply_message) { - DictionaryValue* items = g_browser_process->local_state()-> - GetPreferenceValues(); + scoped_ptr<DictionaryValue> items( + g_browser_process->local_state()->GetPreferenceValues()); scoped_ptr<DictionaryValue> return_value(new DictionaryValue); - return_value->Set("prefs", items); // return_value owns items. + return_value->Set("prefs", items.release()); // return_value owns items. AutomationJSONReply(this, reply_message).SendSuccess(return_value.get()); } @@ -2829,11 +2829,11 @@ void TestingAutomationProvider::GetPrefsInfo(DictionaryValue* args, reply.SendError(error_msg); return; } - DictionaryValue* items = browser->profile()->GetPrefs()-> - GetPreferenceValues(); + scoped_ptr<DictionaryValue> items( + browser->profile()->GetPrefs()->GetPreferenceValues()); scoped_ptr<DictionaryValue> return_value(new DictionaryValue); - return_value->Set("prefs", items); // return_value owns items. + return_value->Set("prefs", items.release()); // return_value owns items. reply.SendSuccess(return_value.get()); } |