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

chrome/browser/component_updater/sw_reporter_installer_win_unittest.cc

 // Copyright 2016 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 <map>
 #include <memory>
 #include <string>
 #include <utility>
@@ skipping 63 matching lines @@
   void ExpectDefaultInvocation() const {
     EXPECT_EQ(default_version_, launched_version_);
     ASSERT_EQ(1U, launched_invocations_.size());
 
     const SwReporterInvocation& invocation = launched_invocations_.front();
     EXPECT_EQ(MakeTestFilePath(default_path_),
               invocation.command_line.GetProgram());
     EXPECT_TRUE(invocation.command_line.GetSwitches().empty());
     EXPECT_TRUE(invocation.command_line.GetArgs().empty());
     EXPECT_TRUE(invocation.suffix.empty());
-    EXPECT_EQ(SwReporterInvocation::FLAG_LOG_TO_RAPPOR |
-                  SwReporterInvocation::FLAG_LOG_EXIT_CODE_TO_PREFS |
-                  SwReporterInvocation::FLAG_TRIGGER_PROMPT |
-                  SwReporterInvocation::FLAG_SEND_REPORTER_LOGS,
-              invocation.flags);
+    EXPECT_EQ(SwReporterInvocation::BEHAVIOUR_LOG_TO_RAPPOR |
+                  SwReporterInvocation::BEHAVIOUR_LOG_EXIT_CODE_TO_PREFS |
+                  SwReporterInvocation::BEHAVIOUR_TRIGGER_PROMPT |
+                  SwReporterInvocation::BEHAVIOUR_ALLOW_SEND_REPORTER_LOGS,
+              invocation.supported_behaviours);
   }
 
   // |ComponentReady| asserts that it is run on the UI thread, so we must
   // create test threads before calling it.
   content::TestBrowserThreadBundle threads_;
 
   // Bound callback to the |SwReporterLaunched| method.
   SwReporterRunner launched_callback_;
 
   // Default parameters for |ComponentReady|.
@@ skipping 82 matching lines @@
     }
 
     if (expected_additional_argument.empty()) {
       EXPECT_TRUE(invocation.command_line.GetArgs().empty());
     } else {
       EXPECT_EQ(1U, invocation.command_line.GetArgs().size());
       EXPECT_EQ(expected_additional_argument,
                 invocation.command_line.GetArgs()[0]);
     }
 
-    EXPECT_EQ(0U, invocation.flags);
+    EXPECT_EQ(0U, invocation.supported_behaviours);
     histograms_.ExpectTotalCount(kErrorHistogramName, 0);
   }
 
   void ExpectLaunchError() {
     // The SwReporter should not be launched, and an error should be logged.
     EXPECT_TRUE(launched_invocations_.empty());
     histograms_.ExpectUniqueSample(kErrorHistogramName,
                                    SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1);
   }
 
@@ skipping 92 matching lines @@
   EXPECT_EQ(MakeTestFilePath(default_path_),
             invocation.command_line.GetProgram());
   EXPECT_EQ(2U, invocation.command_line.GetSwitches().size());
   EXPECT_EQ("experimental",
             invocation.command_line.GetSwitchValueASCII("engine"));
   EXPECT_EQ("TestSuffix",
             invocation.command_line.GetSwitchValueASCII(kRegistrySuffixSwitch));
   ASSERT_EQ(1U, invocation.command_line.GetArgs().size());
   EXPECT_EQ(L"random argument", invocation.command_line.GetArgs()[0]);
   EXPECT_EQ("TestSuffix", invocation.suffix);
-  EXPECT_EQ(0U, invocation.flags);
+  EXPECT_EQ(0U, invocation.supported_behaviours);
   histograms_.ExpectTotalCount(kErrorHistogramName, 0);
 }
 
 TEST_F(ExperimentalSwReporterInstallerTest, MultipleInvocations) {
   SwReporterInstallerTraits traits(launched_callback_, true);
   CreateFeatureWithTag(kExperimentTag);
   ExpectAttributesWithTag(traits, kExperimentTag);
 
   static constexpr char kTestManifest[] =
       "{\"launch_params\": ["
@@ skipping 26 matching lines @@
     EXPECT_EQ(MakeTestFilePath(default_path_),
               invocation.command_line.GetProgram());
     EXPECT_EQ(2U, invocation.command_line.GetSwitches().size());
     EXPECT_EQ("experimental",
               invocation.command_line.GetSwitchValueASCII("engine"));
     EXPECT_EQ("TestSuffix", invocation.command_line.GetSwitchValueASCII(
                                 kRegistrySuffixSwitch));
     ASSERT_EQ(1U, invocation.command_line.GetArgs().size());
     EXPECT_EQ(L"random argument", invocation.command_line.GetArgs()[0]);
     EXPECT_EQ("TestSuffix", invocation.suffix);
-    EXPECT_EQ(0U, invocation.flags);
+    EXPECT_EQ(0U, invocation.supported_behaviours);
   }
 
   {
     SwReporterInvocation invocation = launched_invocations_.front();
     launched_invocations_.pop();
     EXPECT_EQ(MakeTestFilePath(default_path_),
               invocation.command_line.GetProgram());
     EXPECT_EQ(2U, invocation.command_line.GetSwitches().size());
     EXPECT_EQ("second", invocation.command_line.GetSwitchValueASCII("engine"));
     EXPECT_EQ("SecondSuffix", invocation.command_line.GetSwitchValueASCII(
                                   kRegistrySuffixSwitch));
     ASSERT_TRUE(invocation.command_line.GetArgs().empty());
     EXPECT_EQ("SecondSuffix", invocation.suffix);
-    EXPECT_EQ(SwReporterInvocation::FLAG_TRIGGER_PROMPT, invocation.flags);
+    EXPECT_EQ(SwReporterInvocation::BEHAVIOUR_TRIGGER_PROMPT,
+              invocation.supported_behaviours);
   }
 
   {
     SwReporterInvocation invocation = launched_invocations_.front();
     launched_invocations_.pop();
     EXPECT_EQ(MakeTestFilePath(default_path_),
               invocation.command_line.GetProgram());
     EXPECT_EQ(2U, invocation.command_line.GetSwitches().size());
     EXPECT_EQ("third", invocation.command_line.GetSwitchValueASCII("engine"));
     EXPECT_EQ("ThirdSuffix", invocation.command_line.GetSwitchValueASCII(
                                  kRegistrySuffixSwitch));
     ASSERT_TRUE(invocation.command_line.GetArgs().empty());
     EXPECT_EQ("ThirdSuffix", invocation.suffix);
     // A missing "prompt" key means "false".
-    EXPECT_EQ(0U, invocation.flags);
+    EXPECT_EQ(0U, invocation.supported_behaviours);
   }
 
   histograms_.ExpectTotalCount(kErrorHistogramName, 0);
 }
 
 TEST_F(ExperimentalSwReporterInstallerTest, MissingSuffix) {
   SwReporterInstallerTraits traits(launched_callback_, true);
   CreateFeatureWithTag(kExperimentTag);
 
   static constexpr char kTestManifest[] =
@@ skipping 306 matching lines @@
   traits.ComponentReady(
       default_version_, default_path_,
       base::DictionaryValue::From(base::JSONReader::Read(kTestManifest)));
 
   // The SwReporter should not be launched, and an error should be logged.
   EXPECT_TRUE(launched_invocations_.empty());
   histograms_.ExpectUniqueSample(kErrorHistogramName,
                                  SW_REPORTER_EXPERIMENT_ERROR_BAD_PARAMS, 1);
 }
 }  // namespace component_updater