Add another feature flag which allows SuspiciousModule reports to be sent.

chrome/browser/safe_browsing/incident_reporting/incident_reporting_service.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/incident_reporting_service.h"
 
 #include <math.h>
 #include <stddef.h>
 #include <algorithm>
 #include <utility>
 #include <vector>
 
+#include "base/feature_list.h"
 #include "base/macros.h"
 #include "base/metrics/field_trial.h"
 #include "base/metrics/histogram.h"
 #include "base/process/process_info.h"
 #include "base/single_thread_task_runner.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "build/build_config.h"
@@ skipping 12 matching lines @@
 #include "chrome/common/safe_browsing/csd.pb.h"
 #include "components/prefs/pref_service.h"
 #include "components/safe_browsing_db/database_manager.h"
 #include "components/user_prefs/tracked/tracked_preference_validation_delegate.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
 #include "net/url_request/url_request_context_getter.h"
 
 namespace safe_browsing {
 
+// Enables reporting of suspicious modules loaded in the process. If this
+// feature is disabled, incidents get pruned instead of reported.
+extern const base::Feature kIncidentReportingSuspiciousModuleReporting{

[grt (UTC plus 2), 2016/03/29 20:37:58]

nit: omit extern?
nit: space before { (unless git cl format did this)

+    "IncidentReportingSuspiciousModuleReporting",
+    base::FEATURE_DISABLED_BY_DEFAULT};
+
 namespace {
 
 // The action taken for an incident; used for user metrics (see
 // LogIncidentDataType).
 enum IncidentDisposition {
   RECEIVED,
   DROPPED,
   ACCEPTED,
   PRUNED,
   DISCARDED,
@@ skipping 911 matching lines @@
                                                 state.digest)) {
         LogIncidentDataType(PRUNED, *incident);
       } else if (!ProfileCanAcceptIncident(profile_and_context.first,
                                            *incident)) {
         LogIncidentDataType(DROPPED, *incident);
       } else if (!has_download) {
         LogIncidentDataType(NO_DOWNLOAD, *incident);
         // Drop the incident and mark for future pruning since no executable
         // download was found.
         transaction.MarkAsReported(state.type, state.key, state.digest);
+      } else if (incident->GetType() == IncidentType::SUSPICIOUS_MODULE &&

[grt (UTC plus 2), 2016/03/29 20:37:58]

can't say i like having the service know intimate details about specific types
of incidents. can this decision be offloaded to the incident type itself?

[proberge, 2016/03/29 20:47:10]

Yeah, it's not great. We'll get rid of this piece of code shortly after M50
ships.

+                 !base::FeatureList::IsEnabled(
+                     kIncidentReportingSuspiciousModuleReporting)) {
+        LogIncidentDataType(PRUNED, *incident);
+        // Drop the incident and mark for future pruning.
+        transaction.MarkAsReported(state.type, state.key, state.digest);
       } else {
         LogIncidentDataType(ACCEPTED, *incident);
         // Ownership of the payload is passed to the report.
         ClientIncidentReport_IncidentData* data =
             incident->TakePayload().release();
         DCHECK(data->has_incident_time_msec());
         report->mutable_incident()->AddAllocated(data);
         data = nullptr;
         states.push_back(state);
       }
@@ skipping 130 matching lines @@
       if (!profile->IsOffTheRecord())
         OnProfileDestroyed(profile);
       break;
     }
     default:
       break;
   }
 }
 
 }  // namespace safe_browsing