Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4417)

Unified Diff: chrome/browser/search_engines/template_url_service_sync_unittest.cc

Issue 10827319: Fix a memory leak in TemplateURLServiceSyncTest. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: init Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/search_engines/template_url_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/search_engines/template_url_service_sync_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_sync_unittest.cc b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
index 79ad9d3636d5d789190960ed999cd401aec4835e..c4295e63d3c23cf9592405675c214728c8f043b7 100644
--- a/chrome/browser/search_engines/template_url_service_sync_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_sync_unittest.cc
@@ -1914,8 +1914,8 @@ TEST_F(TemplateURLServiceSyncTest, MergeInSyncTemplateURL) {
TemplateURL* local_turl = CreateTestTemplateURL(
local_keyword, local_url, local_guid, local_last_modified);
model()->Add(local_turl);
- TemplateURL* sync_turl = CreateTestTemplateURL(
- sync_keyword, sync_url, sync_guid, sync_last_modified);
+ scoped_ptr<TemplateURL> sync_turl(CreateTestTemplateURL(
+ sync_keyword, sync_url, sync_guid, sync_last_modified));
SyncDataMap sync_data;
if (test_cases[i].synced_at_start == SYNC ||
@@ -1932,7 +1932,7 @@ TEST_F(TemplateURLServiceSyncTest, MergeInSyncTemplateURL) {
TemplateURLService::CreateSyncDataFromTemplateURL(*local_turl);
syncer::SyncChangeList change_list;
- model()->MergeInSyncTemplateURL(sync_turl, sync_data, &change_list,
+ model()->MergeInSyncTemplateURL(sync_turl.get(), sync_data, &change_list,
&initial_data);
// Check for expected updates, if any.
« no previous file with comments | « chrome/browser/search_engines/template_url_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698