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

chrome/browser/component_updater/sw_reporter_installer_win.cc

Index: chrome/browser/component_updater/sw_reporter_installer_win.cc
diff --git a/chrome/browser/component_updater/sw_reporter_installer_win.cc b/chrome/browser/component_updater/sw_reporter_installer_win.cc
index 6de56e53af146b4477edb70f262c0a68cffc14bc..b4d8c1b29f63841b4ba408b7b5b0041b2e034bce 100644
--- a/chrome/browser/component_updater/sw_reporter_installer_win.cc
+++ b/chrome/browser/component_updater/sw_reporter_installer_win.cc
@@ -119,8 +119,8 @@ void ReportExperimentError(SwReporterExperimentError error) {
                             SW_REPORTER_EXPERIMENT_ERROR_MAX);
 }
 
-// Run the software reporter on the next Chrome startup after it's downloaded.
-// (This is the default |reporter_runner| function passed to the
+// Schedules the software reporter to run after browser startup once it's

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

I think this is still ambiguous - "after browser startup" still makes me assume
it means after the next time Chrome is started. How about "after the current
browser startup sequence is finished"?

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

Done.

[grt (UTC plus 2), 2016/09/16 15:59:20]

how about "...to run sometime after browser startup is complete"? the first line
of code just after the comment is PostAterStartupTask, so i don't think the
comment is too ambiguous.

[ftirelo, 2016/09/16 19:26:55]

I kept the "current browser", because even though it's not ambiguous if you
check the code, it can be confusing for people not familiar with the browser
thread lib.

+// downloaded. (This is the default |reporter_runner| function passed to the
 // |SwReporterInstallerTraits| constructor in |RegisterSwReporterComponent|
 // below.)
 void RunSwReportersAfterStartup(
@@ -216,7 +216,7 @@ void RunExperimentalSwReporter(const base::FilePath& exe_path,
       command_line.AppendSwitchASCII("registry-suffix", suffix);
 
     // "prompt" is optional, but if present must be a boolean.
-    SwReporterInvocation::Flags flags = 0;
+    SwReporterInvocation::ReporterBehaviours supported_behaviours = 0;
     const base::Value* prompt_value = nullptr;
     if (invocation_params->Get("prompt", &prompt_value)) {
       bool prompt = false;
@@ -225,12 +225,13 @@ void RunExperimentalSwReporter(const base::FilePath& exe_path,
         return;
       }
       if (prompt)
-        flags |= SwReporterInvocation::FLAG_TRIGGER_PROMPT;
+        supported_behaviours |=
+            SwReporterInvocation::REPORTER_BEHAVIOUR_TRIGGER_PROMPT;
     }
 
     auto invocation = SwReporterInvocation::FromCommandLine(command_line);
     invocation.suffix = suffix;
-    invocation.flags = flags;
+    invocation.supported_behaviours = supported_behaviours;
     invocations.push(invocation);
   }
 
@@ -280,10 +281,11 @@ void SwReporterInstallerTraits::ComponentReady(
                               reporter_runner_);
   } else {
     auto invocation = SwReporterInvocation::FromFilePath(exe_path);
-    invocation.flags = SwReporterInvocation::FLAG_LOG_TO_RAPPOR |
-                       SwReporterInvocation::FLAG_LOG_EXIT_CODE_TO_PREFS |
-                       SwReporterInvocation::FLAG_TRIGGER_PROMPT |
-                       SwReporterInvocation::FLAG_SEND_REPORTER_LOGS;
+    invocation.supported_behaviours =
+        SwReporterInvocation::REPORTER_BEHAVIOUR_LOG_TO_RAPPOR |
+        SwReporterInvocation::REPORTER_BEHAVIOUR_LOG_EXIT_CODE_TO_PREFS |
+        SwReporterInvocation::REPORTER_BEHAVIOUR_TRIGGER_PROMPT |
+        SwReporterInvocation::REPORTER_BEHAVIOUR_SEND_REPORTER_LOGS;
 
     safe_browsing::SwReporterQueue invocations;
     invocations.push(invocation);