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

chrome/browser/component_updater/sw_reporter_installer_win.cc

 // Copyright (c) 2014 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.
 
 #include "chrome/browser/component_updater/sw_reporter_installer_win.h"
 
 #include <stdint.h>
 
 #include <algorithm>
 #include <map>
@@ skipping 101 matching lines @@
   UMA_HISTOGRAM_COUNTS_100("SoftwareReporter.UploadLongestFailureRun",
                            longest_failure_run);
   UMA_HISTOGRAM_BOOLEAN("SoftwareReporter.LastUploadResult", last_result);
 }
 
 void ReportExperimentError(SwReporterExperimentError error) {
   UMA_HISTOGRAM_ENUMERATION("SoftwareReporter.ExperimentErrors", 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(
     const safe_browsing::SwReporterQueue& invocations,
     const base::Version& version) {
   content::BrowserThread::PostAfterStartupTask(
       FROM_HERE, base::ThreadTaskRunnerHandle::Get(),
       base::Bind(&safe_browsing::RunSwReporters, invocations, version,
                  base::ThreadTaskRunnerHandle::Get(),
                  base::WorkerPool::GetTaskRunner(true)));
@@ skipping 75 matching lines @@
 
     base::CommandLine command_line(argv);
 
     // Add the histogram suffix to the command-line as well, so that the
     // reporter will add the same suffix to registry keys where it writes
     // metrics.
     if (!suffix.empty())
       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;
       if (!prompt_value->GetAsBoolean(&prompt)) {
         ReportExperimentError(SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS);
         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);
   }
 
   DCHECK(!invocations.empty());
   reporter_runner.Run(invocations, version);
 }
 
 }  // namespace
 
 SwReporterInstallerTraits::SwReporterInstallerTraits(
@@ skipping 29 matching lines @@
     const base::Version& version,
     const base::FilePath& install_dir,
     std::unique_ptr<base::DictionaryValue> manifest) {
   DCHECK_CURRENTLY_ON(content::BrowserThread::UI);
   const base::FilePath exe_path(install_dir.Append(kSwReporterExeName));
   if (IsExperimentalEngineEnabled()) {
     RunExperimentalSwReporter(exe_path, version, std::move(manifest),
                               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);
     reporter_runner_.Run(invocations, version);
   }
 }
 
 base::FilePath SwReporterInstallerTraits::GetRelativeInstallDir() const {
   return base::FilePath(FILE_PATH_LITERAL("SwReporter"));
 }
@@ skipping 142 matching lines @@
 }
 
 void RegisterProfilePrefsForSwReporter(
     user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterStringPref(prefs::kSwReporterPromptVersion, "");
 
   registry->RegisterStringPref(prefs::kSwReporterPromptSeed, "");
 }
 
 }  // namespace component_updater