Send variations seed version to UMA.

Update variations_seed proto and metrics protos, and send seed versions
to UMA, so it's available for analysis.

Change-Id: Id2954646c6c000af8accde3e43f1eedc9e5c1c1f
Reviewed-on: https://chromium-review.googlesource.com/c/1339242Reviewed-by: Alexei Svitkine <asvitkine@chromium.org>
Commit-Queue: Steven Holte <holte@chromium.org>
Cr-Commit-Position: refs/heads/master@{#610188}

components/metrics/field_trials_provider.cc

@@ -45,6 +45,9 @@ void FieldTrialsProvider::OnDidCreateMetricsLog() {
 void FieldTrialsProvider::ProvideSystemProfileMetrics(
     metrics::SystemProfileProto* system_profile_proto) {
   std::vector<ActiveGroupId> field_trial_ids;
+  const std::string& version = variations::GetSeedVersion();
+  if (!version.empty())
+    system_profile_proto->set_variations_seed_version(version);
   GetFieldTrialIds(&field_trial_ids);
   WriteFieldTrials(field_trial_ids, system_profile_proto);
 

components/variations/active_field_trials.cc

@@ -8,6 +8,7 @@
 
 #include <vector>
 
+#include "base/lazy_instance.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "components/variations/hashing.h"
@@ -17,6 +18,8 @@ namespace variations {
 
 namespace {
 
+base::LazyInstance<std::string>::Leaky g_seed_version;
+
 // Populates |name_group_ids| based on |active_groups|. Field trial names are
 // suffixed with |suffix| before hashing is executed.
 void GetFieldTrialActiveGroupIdsForActiveGroups(
@@ -77,6 +80,14 @@ void GetSyntheticTrialGroupIdsAsString(std::vector<std::string>* output) {
   AppendActiveGroupIdsAsStrings(name_group_ids, output);
 }
 
+void SetSeedVersion(const std::string& seed_version) {
+  g_seed_version.Get() = seed_version;
+}
+
+const std::string& GetSeedVersion() {
+  return g_seed_version.Get();
+}
+
 namespace testing {
 
 void TestGetFieldTrialActiveGroupIds(

components/variations/active_field_trials.h

@@ -63,6 +63,18 @@ void GetFieldTrialActiveGroupIdsAsStrings(base::StringPiece suffix,
 // which hasn't been chosen yet are NOT returned in this list.
 void GetSyntheticTrialGroupIdsAsString(std::vector<std::string>* output);
 
+// Sets the version of the seed that the current set of FieldTrials was
+// generated from.
+// TODO(crbug/507665): Move this to field_trials_provider once it moves
+// into components/variations
+void SetSeedVersion(const std::string& seed_version);
+
+// Gets the version of the seed that the current set of FieldTrials was
+// generated from.
+// TODO(crbug/507665): Move this to field_trials_provider once it moves
+// into components/variations
+const std::string& GetSeedVersion();
+
 // Expose some functions for testing. These functions just wrap functionality
 // that is implemented above.
 namespace testing {

components/variations/proto/variations_seed.proto

@@ -23,4 +23,8 @@ message VariationsSeed {
   // Lowercase ISO 3166-1 alpha-2 country code of the client, according to IP
   // address. Deprecated.
   optional string country_code = 3 [deprecated = true];
+
+  // A version string which identifies the version of the configuration files
+  // that this seed was generated from.
+  optional string version = 4;
 }

components/variations/variations_seed_processor.cc

@@ -172,6 +172,7 @@ void VariationsSeedProcessor::CreateTrialsFromSeed(
     base::FeatureList* feature_list) {
   std::vector<ProcessedStudy> filtered_studies;
   FilterAndValidateStudies(seed, client_state, &filtered_studies);
+  SetSeedVersion(seed.version());
 
   for (const ProcessedStudy& study : filtered_studies) {
     CreateTrialFromStudy(study, override_callback, low_entropy_provider,

third_party/metrics_proto/README.chromium

 Name: Metrics Protos
 Short Name: metrics_proto
 URL: This is the canonical public repository
-Version: 217960420
-Date: 2018/10/20 UTC
+Version: 221728188
+Date: 2018/11/16 UTC
 License: BSD
 Security Critical: Yes
 

third_party/metrics_proto/omnibox_event.proto

@@ -297,13 +297,16 @@ message OmniboxEventProto {
     // matched an open tab.
     optional bool has_tab_match = 8;
 
-    // The Omnibox search provider generates 2 fundamental types of
-    // suggestions: Traditional search suggestions, which throw the terms
-    // against the default search engine (DSE), and keyword search suggestions,
-    // which throw the terms against the search engine selected when the user
-    // initiates keyword mode (which may also be the DSE). When
-    // |is_keyword_suggestion| is true, this suggestion originated from the
-    // latter.
+    // Whether this suggestion came associated with a keyword.  Does not include
+    // suggestions that came from the default search engine unless the search
+    // engine was explicitly invoked.  As two common examples,
+    // |is_keyword_suggestion| will be true for suggestions from explicitly-
+    // invoked suggestions (whether from a search engine or an extension).  It
+    // will also be true for suggestions from a keyword that wasn't explicitly
+    // requested.  For example, if a user has Google as their default search
+    // engine, the input "bing testing" will often show a suggestion to "Search
+    // Bing for testing" in the dropdown.  This suggestion will be marked as
+    // |is_keyword_suggestion|.
     optional bool is_keyword_suggestion = 9;
   }
   repeated Suggestion suggestion = 9;

third_party/metrics_proto/system_profile.proto

@@ -15,7 +15,7 @@ import "extension_install.proto";
 
 // Stores information about the user's brower and system configuration.
 // The system configuration fields are recorded once per client session.
-// Next tag: 28
+// Next tag: 29
 message SystemProfileProto {
   // The time when the client was compiled/linked, in seconds since the epoch.
   optional int64 build_timestamp = 1;
@@ -644,6 +644,10 @@ message SystemProfileProto {
   }
   repeated FieldTrial field_trial = 9;
 
+  // Seed version from variations_seed.proto used to instantiate FieldTrials
+  // for this session.
+  optional string variations_seed_version = 28;
+
   // Information about the A/V output device(s) (typically just a TV).
   // However, a configuration may have one or more intermediate A/V devices
   // between the source device and the TV (e.g. an A/V receiver, video