Merge M52: Add AntiVirus information to the system profile.

components/metrics/proto/system_profile.proto

 // Copyright 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.
 //
 // Stores information about the user's brower and system configuration.
 // The system configuration fields are recorded once per client session.
 
 syntax = "proto2";
 
 option optimize_for = LITE_RUNTIME;
 option java_outer_classname = "SystemProfileProtos";
 option java_package = "org.chromium.components.metrics";
 
 package metrics;
 
-// Next tag: 23
+// Next tag: 24
 message SystemProfileProto {
   // The time when the client was compiled/linked, in seconds since the epoch.
   optional int64 build_timestamp = 1;
 
   // A version number string for the application.
   // Most commonly this is the browser version number found in a user agent
   // string, and is typically a 4-tuple of numbers separated by periods.  In
   // cases where the user agent version might be ambiguous (example: Linux 64-
   // bit build, rather than 32-bit build, or a Windows version used in some
   // special context, such as ChromeFrame running in IE), then this may include
@@ skipping 739 matching lines @@
   // Specifically, whether the enable metrics/crash reporting checkbox that was
   // shown on first run was checked or unchecked by default.
   // This state is recorded on first run, and uploaded in every UMA log.
   // Consequently this should only be defined for clients that were installed
   // after the recording code was implemented.
   enum UmaDefaultState {
     // The enable checkbox was unchecked by default.
     OPT_IN = 0;
     // The enable checkbox was checked by default.
     OPT_OUT = 1;
-    // Policy mandated that UMA be enaled, the user had no choice.
+    // Policy mandated that UMA be enabled, the user had no choice.
     POLICY_FORCED_ENABLED = 2;
   }
   optional UmaDefaultState uma_default_state = 22;
+
+  enum AntiVirusState {
+    // The security product software is turned on and protecting the user.
+    STATE_ON = 0;
+    // The security product software is turned off and protection is disabled.
+    STATE_OFF = 1;
+    // The security product software is in the snoozed state, temporarily off,
+    // and not actively protecting the computer.
+    STATE_SNOOZED = 2;
+    // The security product software has expired and is no longer actively
+    // protecting the computer.
+    STATE_EXPIRED = 3;
+  }
+
+  // Information about AntiVirus products installed.
+  // Next Tag: 6
+  message AntiVirusProduct {
+    // The product name e.g. "System Center Endpoint Protection". This might not
+    // be recorded, see ShouldReportFullNames() in
+    // chrome/browser/metrics/antivirus_metrics_provider_win.cc.
+    optional string product_name = 1;
+
+    // The hash of the product name.
+    optional fixed32 product_name_hash = 2;
+
+    // The version of the product, as read from the file information. This might
+    // not be recorded, see ShouldReportFullNames() in
+    // chrome/browser/metrics/antivirus_metrics_provider_win.cc.
+    optional string product_version = 3;
+
+    // The hash of the product version. Might not be set if the product version
+    // could not be obtained from the disk.
+    optional fixed32 product_version_hash = 4;
+
+    // The current state of the product.
+    optional AntiVirusState product_state = 5;
+  }
+  repeated AntiVirusProduct antivirus_product = 23;
 }