commit 2e565b005d42d238e608ce3801c70eaf8757bd5a
author Alex Deymo <deymo@google.com> Thu Feb 11 00:09:36 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 11 00:09:37 2016 +0000
tree b3d33c7ddbdad85b27598a4fcd39d02c470befbd
parent d89811042a2f26196121c5464fc88be14c7d3943
parent b2e671335777d6d10c9c30f4a2289c791cef4eb6

Merge "Fix UploadService unittests."

metricsd/uploader/upload_service_test.cc

diff --git a/metricsd/uploader/upload_service_test.cc b/metricsd/uploader/upload_service_test.cc
index 70112f4..0f77fe4 100644
--- a/metricsd/uploader/upload_service_test.cc
+++ b/metricsd/uploader/upload_service_test.cc
@@ -304,6 +304,8 @@
   upload_service_->PersistToDisk();
   EXPECT_EQ(
       1, upload_service_->current_log_->uma_proto()->histogram_event().size());
+  // Destroy the old service before creating a new one.
+  upload_service_.reset();
   upload_service_.reset(new UploadService(
       "", base::TimeDelta(), base::TimeDelta(), private_dir_, shared_dir_));
   upload_service_->InitForTest(nullptr);
@@ -325,6 +327,8 @@
   // Write a bogus saved log.
   EXPECT_EQ(5, base::WriteFile(upload_service_->saved_log_path_, "hello", 5));
 
+  // Destroy the old service before creating a new one.
+  upload_service_.reset();
   upload_service_.reset(new UploadService(
       "", base::TimeDelta(), base::TimeDelta(), private_dir_, shared_dir_));