Add a new safe browsing incident reporting service unit test.

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 <map>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 100 matching lines @@
   enum SafeBrowsingDisposition {
     SAFE_BROWSING_OPT_OUT,
     SAFE_BROWSING_OPT_IN,
   };
 
   // A type for specifying the action to be taken by the test fixture during
   // profile initialization (before NOTIFICATION_PROFILE_ADDED is sent).
   enum OnProfileAdditionAction {
     ON_PROFILE_ADDITION_NO_ACTION,
     ON_PROFILE_ADDITION_ADD_INCIDENT,  // Add an incident to the service.
+    ON_PROFILE_ADDITION_ADD_TWO_INCIDENTS,  // Add two incidents to the service.
   };
 
   // A type for specifying the action to be taken by the test fixture when the
   // service creates a LastDownloadFinder.
   enum OnCreateDownloadFinderAction {
     // Post a task that reports a download.
     ON_CREATE_DOWNLOAD_FINDER_DOWNLOAD_FOUND,
     // Post a task that reports no downloads found.
     ON_CREATE_DOWNLOAD_FINDER_NO_DOWNLOADS,
     // Immediately return due to a lack of eligible profiles.
@@ skipping 82 matching lines @@
     incident->set_incident_time_msec(kIncidentTimeMsec);
     incident->mutable_tracked_preference();
     return incident.Pass();
   }
 
   // Adds a test incident to the service.
   void AddTestIncident(Profile* profile) {
     instance_->GetAddIncidentCallback(profile).Run(MakeTestIncident().Pass());
   }
 
-  // Confirms that the test incident was uploaded by the service, then clears
-  // the instance for subsequent incidents.
-  void ExpectTestIncidentUploaded() {
+  // Confirms that the test incident(s) was/were uploaded by the service, then
+  // clears the instance for subsequent incidents.
+  void ExpectTestIncidentUploaded(int incident_count) {
     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_EQ(incident_count, uploaded_report_->incident_size());
+    for (int i = 0; i < incident_count; ++i) {
+      ASSERT_TRUE(uploaded_report_->incident(i).has_incident_time_msec());
+      ASSERT_EQ(kIncidentTimeMsec,
+                uploaded_report_->incident(i).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());
     ASSERT_EQ(std::string(kFakeDownloadToken),
               uploaded_report_->download().token());
 
     uploaded_report_.reset();
   }
@@ skipping 107 matching lines @@
   // A callback run by the test fixture when a profile is added. An incident
   // is added.
   void PreProfileAdd(Profile* profile) {
     // The instance must have already been created.
     ASSERT_TRUE(instance_);
     // Add a test incident to the service if requested.
     switch (profile_properties_[GetProfileName(profile)].on_addition_action) {
       case ON_PROFILE_ADDITION_ADD_INCIDENT:
         AddTestIncident(profile);
         break;
+      case ON_PROFILE_ADDITION_ADD_TWO_INCIDENTS:
+        AddTestIncident(profile);
+        AddTestIncident(profile);
+        break;
       default:
         ASSERT_EQ(
             ON_PROFILE_ADDITION_NO_ACTION,
             profile_properties_[GetProfileName(profile)].on_addition_action);
         break;
     }
   }
 
   // A fake CollectEnvironmentData implementation invoked by the service during
   // operation.
@@ skipping 76 matching lines @@
   task_runner_->RunUntilIdle();
 
   // Verify that environment collection took place.
   EXPECT_TRUE(HasCollectedEnvironmentData());
 
   // Verify that the most recent download was looked for.
   EXPECT_TRUE(HasCreatedDownloadFinder());
 
   // Verify that report upload took place and contained the incident,
   // environment data, and download details.
-  ExpectTestIncidentUploaded();
+  ExpectTestIncidentUploaded(1);
 
   // Verify that the download finder and the uploader were destroyed.
   ASSERT_TRUE(DownloadFinderDestroyed());
+  ASSERT_TRUE(UploaderDestroyed());
+}
+
+// Tests that multiple incidents are coalesced into the same report.
+TEST_F(IncidentReportingServiceTest, CoalesceIncidents) {
+  CreateProfile(
+      "profile1", SAFE_BROWSING_OPT_IN, ON_PROFILE_ADDITION_ADD_TWO_INCIDENTS);
+
+  // Let all tasks run.
+  task_runner_->RunUntilIdle();
+
+  // Verify that environment collection took place.
+  EXPECT_TRUE(HasCollectedEnvironmentData());
+
+  // Verify that the most recent download was looked for.
+  EXPECT_TRUE(HasCreatedDownloadFinder());
+
+  // Verify that report upload took place and contained the incident,
+  // environment data, and download details.
+  ExpectTestIncidentUploaded(2);
+
+  // Verify that the download finder and the uploader were destroyed.
+  ASSERT_TRUE(DownloadFinderDestroyed());
   ASSERT_TRUE(UploaderDestroyed());
 }
 
 // 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.
   CreateProfile(
       "profile1", SAFE_BROWSING_OPT_OUT, ON_PROFILE_ADDITION_ADD_INCIDENT);
 
@@ skipping 49 matching lines @@
 TEST_F(IncidentReportingServiceTest, OnlyOneUpload) {
   // Create the profile, thereby causing the test to begin.
   Profile* profile = CreateProfile(
       "profile1", SAFE_BROWSING_OPT_IN, ON_PROFILE_ADDITION_ADD_INCIDENT);
 
   // Let all tasks run.
   task_runner_->RunUntilIdle();
 
   // Verify that report upload took place and contained the incident and
   // environment data.
-  ExpectTestIncidentUploaded();
+  ExpectTestIncidentUploaded(1);
 
   // Add the incident to the service again.
   AddTestIncident(profile);
 
   // Let all tasks run.
   task_runner_->RunUntilIdle();
 
   // Verify that no additional report upload took place.
   AssertNoUpload();
 }
 
 // Tests that the same incident added for two different profiles in sequence
 // results in two uploads.
 TEST_F(IncidentReportingServiceTest, TwoProfilesTwoUploads) {
   // Create the profile, thereby causing the test to begin.
   CreateProfile(
       "profile1", SAFE_BROWSING_OPT_IN, ON_PROFILE_ADDITION_ADD_INCIDENT);
 
   // Let all tasks run.
   task_runner_->RunUntilIdle();
 
   // Verify that report upload took place and contained the incident and
   // environment data.
-  ExpectTestIncidentUploaded();
+  ExpectTestIncidentUploaded(1);
 
   // Create a second profile with its own incident on addition.
   CreateProfile(
       "profile2", SAFE_BROWSING_OPT_IN, ON_PROFILE_ADDITION_ADD_INCIDENT);
 
   // Let all tasks run.
   task_runner_->RunUntilIdle();
 
   // Verify that a second report upload took place.
-  ExpectTestIncidentUploaded();
+  ExpectTestIncidentUploaded(1);
 }
 
 // Tests that an upload succeeds if the profile is destroyed while it is
 // pending.
 TEST_F(IncidentReportingServiceTest, ProfileDestroyedDuringUpload) {
   // Create a profile for which an incident will be added.
   Profile* profile = CreateProfile(
       "profile1", SAFE_BROWSING_OPT_IN, ON_PROFILE_ADDITION_ADD_INCIDENT);
 
   // Hook up a callback to run when the upload is started that will post a task
   // to delete the profile. This task will run before the upload finishes.
   DeleteProfileOnUpload(profile);
 
   // Let all tasks run.
   task_runner_->RunUntilIdle();
 
   // Verify that report upload took place and contained the incident and
   // environment data.
-  ExpectTestIncidentUploaded();
+  ExpectTestIncidentUploaded(1);
 
   // The lack of a crash indicates that the deleted profile was not accessed by
   // the service while handling the upload response.
 }
 
 // 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