Prune all safe browsing incidents when already reported.

chrome/browser/safe_browsing/incident_reporting_service_unittest.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/safe_browsing/incident_reporting_service.h"
 
 #include <string>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 120 matching lines @@
   // Returns an incident suitable for testing.
   scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData>
   MakeTestIncident() {
     scoped_ptr<safe_browsing::ClientIncidentReport_IncidentData> incident(
         new safe_browsing::ClientIncidentReport_IncidentData());
     incident->set_incident_time_msec(kIncidentTimeMsec);
     incident->mutable_tracked_preference();
     return incident.Pass();
   }
 
-  // Confirms that the test incident was uploaded by the service.
+  // Confirms that the test incident was uploaded by the service, then clears
+  // the instance for subsequent incidents.
   void ExpectTestIncidentUploaded() {
     ASSERT_TRUE(uploaded_report_);
     ASSERT_EQ(1, uploaded_report_->incident_size());
     ASSERT_TRUE(uploaded_report_->incident(0).has_incident_time_msec());
     ASSERT_EQ(kIncidentTimeMsec,
               uploaded_report_->incident(0).incident_time_msec());
     ASSERT_TRUE(uploaded_report_->has_environment());
     ASSERT_TRUE(uploaded_report_->environment().has_os());
     ASSERT_TRUE(uploaded_report_->environment().os().has_os_name());
     ASSERT_EQ(std::string(kFakeOsName),
               uploaded_report_->environment().os().os_name());
+
+    uploaded_report_.reset();
   }
 
   void ExpectNoUpload() { ASSERT_FALSE(uploaded_report_); }
 
   bool HasCollectedEnvironmentData() const { return environment_collected_; }
   bool UploaderDestroyed() const { return uploader_destroyed_; }
 
   scoped_refptr<base::TestSimpleTaskRunner> task_runner_;
   base::ThreadTaskRunnerHandle thread_task_runner_handle_;
   ScopedTestingLocalState local_state_;
@@ skipping 104 matching lines @@
 // Tests that an incident added during profile initialization when safe browsing
 // is off is not uploaded.
 TEST_F(IncidentReportingServiceTest, NoSafeBrowsing) {
   // Create the profile, thereby causing the test to begin.
   CreateProfileAndRunTest(false);
 
   // Verify that no report upload took place.
   ExpectNoUpload();
 }
 
+// Tests that an incident added after upload is not uploaded again.

[mattm, 2014/06/19 21:43:11]

Add a test of incident reported and uploaded for one profile, then an incident
on another profile still gets uploaded.

[mattm, 2014/06/19 21:43:11]

Add a test of profile gets destroyed while upload is pending.

[grt (UTC plus 2), 2014/06/20 03:24:10]

Done (TwoProfilesTwoUploads).

[grt (UTC plus 2), 2014/06/20 03:24:10]

Done (ProfileDestroyedDuringUpload).

+TEST_F(IncidentReportingServiceTest, OnlyOneUpload) {
+  // Create the profile, thereby causing the test to begin.
+  CreateProfileAndRunTest(true);
+
+  // Verify that report upload took place and contained the incident and
+  // environment data.
+  ExpectTestIncidentUploaded();
+
+  // Add the incident to the service again.
+  instance_->GetAddIncidentCallback(testing_profile_.get())
+      .Run(MakeTestIncident().Pass());
+
+  // Let all tasks run.
+  task_runner_->RunUntilIdle();
+
+  // Verify that no additional report upload took place.
+  ExpectNoUpload();
+}
+
 // Parallel uploads
 // Shutdown during processing
 // environment colection taking longer than incident delay timer
 // environment colection taking longer than incident delay timer, and then
 // another incident arriving