Add support for the ExperimentalSwReporterEngine field trial.

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 <queue>
 #include <string>
 
 #include "base/callback_forward.h"
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/version.h"
 
 namespace base {
 class FilePath;
 class TaskRunner;
@@ skipping 23 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;
 
-  // The experimental sw_reporter never triggers the prompt, just reports
-  // results through UMA.
-  bool is_experimental = false;
+  // 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 = unsigned int;

[grt (UTC plus 2), 2016/09/01 21:08:56]

"unsigned int" is almost never what you want; see
https://google.github.io/styleguide/cppguide.html#Integer_Types. go with
uint32_t (and #include <stdint.h>).

[Joe Mason, 2016/09/02 02:24:30]

Done.

+  enum : Flags {
+    FLAG_LOG_TO_RAPPOR = 0x1,
+    FLAG_LOG_TO_PREFS = 0x2,
+    FLAG_TRIGGER_PROMPT = 0x4,
+  };
+  Flags flags = FLAG_LOG_TO_RAPPOR | FLAG_LOG_TO_PREFS | FLAG_TRIGGER_PROMPT;
 
   SwReporterInvocation();
 
   static SwReporterInvocation FromFilePath(const base::FilePath& exe_path);
   static SwReporterInvocation FromCommandLine(
       const base::CommandLine& command_line);
 
   bool operator==(const SwReporterInvocation& other) const;
 };
 
+using SwReporterQueue = std::queue<SwReporterInvocation>;
+
 // Tries to run the sw_reporter component, and then schedule the next try. If
 // called multiple times, then multiple sequences of trying to run will happen,
-// yet only one reporter will run per specified period (either
+// yet only one SwReporterQueue will run per specified period (either
 // |kDaysBetweenSuccessfulSwReporterRuns| or
 // |kDaysBetweenSwReporterRunsForPendingPrompt|) will actually happen.

[grt (UTC plus 2), 2016/09/01 21:08:55]

i think " will actually happen" should be removed.

[Joe Mason, 2016/09/02 02:24:30]

Done.

-// |invocation| is the details of the SwReporter to execute, and |version| is
-// its version. The task runners are provided to allow tests to provide their
-// own.
-void RunSwReporter(const SwReporterInvocation& invocation,
-                   const base::Version& version,
-                   scoped_refptr<base::TaskRunner> main_thread_task_runner,
-                   scoped_refptr<base::TaskRunner> blocking_task_runner);
+//
+// Each "run" of the sw_reporter component may actually involve executing the

[grt (UTC plus 2), 2016/09/01 21:08:55]

suggestion: "...may aggregate the results of several executions of the tool with
different command lines."

[Joe Mason, 2016/09/02 02:24:30]

Done.

+// tool several times with different command-lines, and aggregating the
+// results. |invocations| is the queue of SwReporters to execute as a single
+// "run". When a new try is scheduled the entire queue is executed.
+//
+// |version| is the version of the tool that will run. The task runners are
+// provided to allow tests to provide their own.
+void RunSwReporters(const SwReporterQueue& invocations,
+                    const base::Version& version,
+                    scoped_refptr<base::TaskRunner> main_thread_task_runner,
+                    scoped_refptr<base::TaskRunner> blocking_task_runner);
 
 // Returns true iff Local State is successfully accessed and indicates the most
 // recent Reporter run terminated with an exit code indicating the presence of
 // UwS.
 bool ReporterFoundUws();
 
 // Returns true iff a valid registry key for the SRT Cleaner exists, and that
 // key is nonempty.
 // TODO(tmartino): Consider changing to check whether the user has recently
 // run the cleaner, rather than checking if they've run it at all.
@@ skipping 20 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_