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 32 matching lines @@
 // The number of days to wait before triggering another reporter run.
 const int kDaysBetweenSuccessfulSwReporterRuns = 7;
 const int kDaysBetweenSwReporterRunsForPendingPrompt = 1;
 // The number of days to wait before sending out reporter logs.
 const int kDaysBetweenReporterLogsSent = 7;
 
 extern const char kExtendedSafeBrowsingEnabledSwitch[];
 
 extern const base::Feature kSwReporterExtendedSafeBrowsingFeature;
 
+// The possible behaviours implemented by the Software Reporter.
+enum class SwReporterBehaviours : uint8_t {
+  ALL_DISABLED = 0x0,
+  LOG_TO_RAPPOR = 0x1,
+  LOG_EXIT_CODE_TO_PREFS = 0x2,
+  TRIGGER_PROMPT = 0x4,
+  SEND_REPORTER_LOGS = 0x8,
+};
+
+SwReporterBehaviours operator&(SwReporterBehaviours a, SwReporterBehaviours b);

[grt (UTC plus 2), 2016/09/16 20:12:42]

oh my. this is overcomplicating things. i'm sorry i suggested using enum class!
anything is better than this!

[ftirelo, 2016/09/16 21:00:10]

Done. However, please notice that I kep BehaviourIsEnabled() in the anonymous
namespace in srt_fetcher_win.cc, because I think the conditions are more
readable that way.

+SwReporterBehaviours operator|(SwReporterBehaviours a, SwReporterBehaviours b);
+
+// Returns true if |intended_behaviour| is enabled in |behaviours|.
+bool BehaviourIsEnabled(SwReporterBehaviours behaviours,
+                        SwReporterBehaviours intended_behaviour);
+
 // 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 flags = 0;
+  // 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.
+  SwReporterBehaviours supported_behaviours =
+      SwReporterBehaviours::ALL_DISABLED;
+
+  // 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_