Adds histograms for tracking Software Reporter logs uploads in SRT Fetcher.

chrome/browser/safe_browsing/srt_fetcher_win.h

Index: chrome/browser/safe_browsing/srt_fetcher_win.h
diff --git a/chrome/browser/safe_browsing/srt_fetcher_win.h b/chrome/browser/safe_browsing/srt_fetcher_win.h
index 1ff81f3980caa5bfd82bef1258a706b170a81b07..51314aa4f2f06cf1bda5df21f719440a038f25e6 100644
--- a/chrome/browser/safe_browsing/srt_fetcher_win.h
+++ b/chrome/browser/safe_browsing/srt_fetcher_win.h
@@ -59,17 +59,21 @@ struct SwReporterInvocation {
   // ending in |suffix|. For the canonical version, |suffix| will be empty.
   std::string suffix;
 
-  // Flags to control optional behaviours. By default all are enabled;
-  // experimental versions of the reporter will turn off the behaviours that
-  // are not yet supported.
-  using Flags = uint32_t;
-  enum : Flags {
-    FLAG_LOG_TO_RAPPOR = 0x1,
-    FLAG_LOG_EXIT_CODE_TO_PREFS = 0x2,
-    FLAG_TRIGGER_PROMPT = 0x4,
-    FLAG_SEND_REPORTER_LOGS = 0x8,
+  // Flags to control behaviours the Software Reporter should support by
+  // default. These flags are set in the Reporter installer, and experimental
+  // versions of the reporter will turn off the behaviours that are not yet
+  // supported.

[csharp, 2016/09/20 14:29:54]

This comment is slightly out of date, since by default all behaviours are
disabled and then turned on as required.

[ftirelo, 2016/09/20 16:41:42]

Done.

+  using Behaviours = uint32_t;
+  enum : Behaviours {
+    BEHAVIOUR_LOG_TO_RAPPOR = 0x1,
+    BEHAVIOUR_LOG_EXIT_CODE_TO_PREFS = 0x2,
+    BEHAVIOUR_TRIGGER_PROMPT = 0x4,
+    BEHAVIOUR_SEND_REPORTER_LOGS = 0x8,

[csharp, 2016/09/20 14:29:54]

As discussed, this might be clearer if it is named
"BEHAVIOUR_ALLOW_SEND_REPORTER_LOGS"

[ftirelo, 2016/09/20 16:41:42]

Done.

   };
-  Flags flags = 0;
+  Behaviours supported_behaviours = 0;
+
+  // Whether logs upload was enabled in this invocation.
+  bool logs_upload_enabled = false;
 
   SwReporterInvocation();