DeviceInfo into GenericSets

docs/histogram-set-json-format.md

 <!-- 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.
 -->
 
 # HistogramSet JSON Format
 
 This document assumes familiarity with the concepts introduced in
 [how-to-write-metrics](/docs/how-to-write-metrics.md).
 
@@ skipping 115 matching lines @@
 ## Diagnostics
 
 The only field that is required for all Diagnostics, `type`, must be one of
  * `GenericSet`
  * `RelatedEventSet`
  * `Breakdown`
  * `RelatedHistogramSet`
  * `RelatedHistogramMap`
  * `RelatedHistogramBreakdown`
  * `TelemetryInfo`
- * `DeviceInfo`
  * `RevisionInfo`
  * `BuildbotInfo`
  * `Scalar`
 
 If a Diagnostic is in the root array of the JSON, then it is shared, so it may be
 referenced by multiple Histograms. Shared Diagnostics must contain a string
 field `guid` containing a UUID.
 
 If a Diagnostic is contained in a Histogram, then it must not have a `guid`
 field.
@@ skipping 20 matching lines @@
 
  * `chromiumCommitPosition`: optional integer
  * `v8CommitPosition`: optional integer
  * `chromium`: array of 1 or 2 strings
  * `v8`: array of 1 or 2 strings
  * `catapult`: array of 1 or 2 strings
  * `angle`: array of 1 or 2 strings
  * `skia`: array of 1 or 2 strings
  * `webrtc`: array of 1 or 2 strings
 
-### DeviceInfo
-
-This tracks information about the device that was used to produce the Histogram
-to allow users to compare or merge results across similar devices.
-
- * `chromeVersion`: string
- * `osName`: one of
-    * `mac`
-    * `android`
-    * `linux`
-    * `chrome`
-    * `win`
- * `osVersion`: string
- * `arch`: not yet specified, but will contain bittiness (32-bit vs 64-bit)
- * `gpuInfo`: not yet specified, but will contain information about the GPU
- * `ram`: number of bytes of RAM
-
 ### BuildbotInfo
 
 This tracks buildbot parameters when the Histogram was produced to allow users
 to compare or merge results across similar bots.
 
  * `displayMasterName`: string
  * `displayBotName`: string
  * `buildbotMasterName`: string
  * `buildbotName`: string
  * `buildNumber`: number
@@ skipping 50 matching lines @@
 
  * `events`: array of dictionaries containing `stableId`, `title`, `start`,
    `duration` fields of Events
 
 ### DateRange
 
 This is a Range of Dates.
 
  * `min`: Unix timestamp in ms
  * `max`: optional Unix timestamp in ms