Index: chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc |
diff --git a/chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc b/chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc |
index a7b9aeda3cd1d9bc11b3a629c52dd47434c67cc0..b7a663d7a7e54f35e70a495a4a34f272695391c3 100644 |
--- a/chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc |
+++ b/chrome/browser/component_updater/test/component_updater_ping_manager_unittest.cc |
@@ -68,13 +68,13 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
EXPECT_TRUE(interceptor); |
// Test eventresult="1" is sent for successful updates. |
- CrxUpdateItem item; |
- item.id = "abc"; |
- item.status = CrxUpdateItem::kUpdated; |
- item.previous_version = base::Version("1.0"); |
- item.next_version = base::Version("2.0"); |
+ scoped_ptr<CrxUpdateItem> item(new CrxUpdateItem()); |
+ item->id = "abc"; |
+ item->status = CrxUpdateItem::kUpdated; |
+ item->previous_version = base::Version("1.0"); |
+ item->next_version = base::Version("2.0"); |
- ping_manager_->OnUpdateComplete(&item); |
+ ping_manager_->OnUpdateComplete(item.get()); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
@@ -86,13 +86,13 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
interceptor->Reset(); |
// Test eventresult="0" is sent for failed updates. |
- item = CrxUpdateItem(); |
- item.id = "abc"; |
- item.status = CrxUpdateItem::kNoUpdate; |
- item.previous_version = base::Version("1.0"); |
- item.next_version = base::Version("2.0"); |
+ item.reset(new CrxUpdateItem()); |
+ item->id = "abc"; |
+ item->status = CrxUpdateItem::kNoUpdate; |
+ item->previous_version = base::Version("1.0"); |
+ item->next_version = base::Version("2.0"); |
- ping_manager_->OnUpdateComplete(&item); |
+ ping_manager_->OnUpdateComplete(item.get()); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
@@ -104,23 +104,23 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
interceptor->Reset(); |
// Test the error values and the fingerprints. |
- item = CrxUpdateItem(); |
- item.id = "abc"; |
- item.status = CrxUpdateItem::kNoUpdate; |
- item.previous_version = base::Version("1.0"); |
- item.next_version = base::Version("2.0"); |
- item.previous_fp = "prev fp"; |
- item.next_fp = "next fp"; |
- item.error_category = 1; |
- item.error_code = 2; |
- item.extra_code1 = -1; |
- item.diff_error_category = 10; |
- item.diff_error_code = 20; |
- item.diff_extra_code1 = -10; |
- item.diff_update_failed = true; |
- item.crx_diffurls.push_back(GURL("http://host/path")); |
- |
- ping_manager_->OnUpdateComplete(&item); |
+ item.reset(new CrxUpdateItem()); |
+ item->id = "abc"; |
+ item->status = CrxUpdateItem::kNoUpdate; |
+ item->previous_version = base::Version("1.0"); |
+ item->next_version = base::Version("2.0"); |
+ item->previous_fp = "prev fp"; |
+ item->next_fp = "next fp"; |
+ item->error_category = 1; |
+ item->error_code = 2; |
+ item->extra_code1 = -1; |
+ item->diff_error_category = 10; |
+ item->diff_error_code = 20; |
+ item->diff_extra_code1 = -10; |
+ item->diff_update_failed = true; |
+ item->crx_diffurls.push_back(GURL("http://host/path")); |
+ |
+ ping_manager_->OnUpdateComplete(item.get()); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |
@@ -136,11 +136,11 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
interceptor->Reset(); |
// Test the download metrics. |
- item = CrxUpdateItem(); |
- item.id = "abc"; |
- item.status = CrxUpdateItem::kUpdated; |
- item.previous_version = base::Version("1.0"); |
- item.next_version = base::Version("2.0"); |
+ item.reset(new CrxUpdateItem()); |
+ item->id = "abc"; |
+ item->status = CrxUpdateItem::kUpdated; |
+ item->previous_version = base::Version("1.0"); |
+ item->next_version = base::Version("2.0"); |
CrxDownloader::DownloadMetrics download_metrics; |
download_metrics.url = GURL("http://host1/path1"); |
@@ -149,7 +149,7 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
download_metrics.downloaded_bytes = 123; |
download_metrics.total_bytes = 456; |
download_metrics.download_time_ms = 987; |
- item.download_metrics.push_back(download_metrics); |
+ item->download_metrics.push_back(download_metrics); |
download_metrics = CrxDownloader::DownloadMetrics(); |
download_metrics.url = GURL("http://host2/path2"); |
@@ -158,9 +158,9 @@ TEST_F(ComponentUpdaterPingManagerTest, DISABLED_PingManagerTest) { |
download_metrics.downloaded_bytes = 1230; |
download_metrics.total_bytes = 4560; |
download_metrics.download_time_ms = 9870; |
- item.download_metrics.push_back(download_metrics); |
+ item->download_metrics.push_back(download_metrics); |
- ping_manager_->OnUpdateComplete(&item); |
+ ping_manager_->OnUpdateComplete(item.get()); |
base::RunLoop().RunUntilIdle(); |
EXPECT_EQ(1, interceptor->GetCount()) << interceptor->GetRequestsAsString(); |