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

chrome/browser/safe_browsing/srt_fetcher_win.h

 // Copyright 2015 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.
 
 #ifndef CHROME_BROWSER_SAFE_BROWSING_SRT_FETCHER_WIN_H_
 #define CHROME_BROWSER_SAFE_BROWSING_SRT_FETCHER_WIN_H_
 
 #include <limits.h>
 #include <stdint.h>
 
@@ skipping 41 matching lines @@
 
 // Parameters used to invoke the sw_reporter component.
 struct SwReporterInvocation {
   base::CommandLine command_line;
 
   // Experimental versions of the reporter will write metrics to registry keys
   // ending in |suffix|. Those metrics should be copied to UMA histograms also
   // 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.
+  using ReporterBehaviours = uint32_t;

[Joe Mason, 2016/09/16 14:57:13]

This could just be called "Behaviours" and the flags start with BEHAVIOUR_,
since they're already in the SwReporterInvocation class it's clear they're
talking about the reporter. And the enum names get pretty long.

[ftirelo, 2016/09/16 15:34:42]

Done.

+  enum : ReporterBehaviours {
+    REPORTER_BEHAVIOUR_LOG_TO_RAPPOR = 0x1,
+    REPORTER_BEHAVIOUR_LOG_EXIT_CODE_TO_PREFS = 0x2,
+    REPORTER_BEHAVIOUR_TRIGGER_PROMPT = 0x4,
+    REPORTER_BEHAVIOUR_SEND_REPORTER_LOGS = 0x8,
   };
-  Flags flags = 0;
+  ReporterBehaviours supported_behaviours = 0;
+
+  // Whether logs upload was enabled in this invocation.
+  bool logs_upload_enabled = false;
 
   SwReporterInvocation();
 
   static SwReporterInvocation FromFilePath(const base::FilePath& exe_path);
   static SwReporterInvocation FromCommandLine(
       const base::CommandLine& command_line);
 
   bool operator==(const SwReporterInvocation& other) const;
 };
 
@@ skipping 49 matching lines @@
 
 // Set a delegate for testing. The implementation will not take ownership of
 // |delegate| - it must remain valid until this function is called again to
 // reset the delegate. If |delegate| is nullptr, any previous delegate is
 // cleared.
 void SetSwReporterTestingDelegate(SwReporterTestingDelegate* delegate);
 
 }  // namespace safe_browsing
 
 #endif  // CHROME_BROWSER_SAFE_BROWSING_SRT_FETCHER_WIN_H_