Revert of Add pretty printing for rappor.xml

tools/metrics/rappor/rappor.xml

Index: tools/metrics/rappor/rappor.xml
diff --git a/tools/metrics/rappor/rappor.xml b/tools/metrics/rappor/rappor.xml
index 8e52f4aa7724c1038eabe399495c79f505d74360..2f7cac2701325bac5099e8c029b69ed3289591f7 100644
--- a/tools/metrics/rappor/rappor.xml
+++ b/tools/metrics/rappor/rappor.xml
@@ -1,47 +1,70 @@
 <!--
-Copyright 2015 The Chromium Authors. All rights reserved.
+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.
 -->
 
-<rappor-configuration>
 <!--
 This file is used to generate a comprehensive list of Chrome rappor metrics
 along with a detailed description for each histogram. See the design doc at
 http://www.chromium.org/developers/design-documents/rappor
 for a description of rappor metrics.
+
+TODO(holte): Add validation and pretty printing scripts.
 -->
 
-<rappor-parameter-types>
+<rappor-configuration>
+
 <!--
 Parameters that rappor metrics can be collected with.  This list should be
 kept in sync with parameter type definitions in
 components/rappor/rappor_service.cc.
 -->
 
-<rappor-parameters name="COARSE_RAPPOR_TYPE">
-  <summary>
-    Stricter parameters for metrics collected from a broader population.
-  </summary>
-  <parameters num-cohorts="128" bytes="1" hash-functions="2" fake-prob="0.5"
-      fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
-      reporting-level="COARSE"/>
-</rappor-parameters>
+<rappor-parameter-types>
 
 <rappor-parameters name="ETLD_PLUS_ONE">
   <summary>
     Parameters suitable for collecting the domain and registry of a URL from
     UMA opt-in users.
   </summary>
-  <parameters num-cohorts="128" bytes="16" hash-functions="2" fake-prob="0.5"
-      fake-one-prob="0.5" one-coin-prob="0.75" zero-coin-prob="0.25"
-      reporting-level="FINE"/>
+  <parameters num-cohorts="128"
+              bytes="16"
+              hash-functions="2"
+              fake-prob=".5"
+              fake-one-prob=".5"
+              one-coin-prob=".75"
+              zero-coin-prob=".25"
+              reporting-level="FINE">
+  </parameters>
+</rappor-parameters>
+
+<rappor-parameters name="COARSE_RAPPOR_TYPE">
+  <summary>
+    Stricter parameters for metrics collected from a broader population.
+  </summary>
+  <parameters num-cohorts="128"
+              bytes="1"
+              hash-functions="2"
+              fake-prob=".5"
+              fake-one-prob=".5"
+              one-coin-prob=".75"
+              zero-coin-prob=".25"
+              reporting-level="COARSE">
 </rappor-parameters>
 
 </rappor-parameter-types>
 
+<!-- Rappor metric definitions -->
+
 <rappor-metrics>
-<!-- Rappor metric definitions -->
+
+<rappor-metric name="Extensions.PossibleAdInjection2" type="ETLD_PLUS_ONE">
+  <owner>rdevlin.cronin@chromium.org</owner>
+  <summary>
+    The eTLD+1 of a URL that might be doing ad injection.
+  </summary>
+</rappor-metric>
 
 <rappor-metric name="ContentSettings.MixedScript.DisplayedShield"
     type="ETLD_PLUS_ONE">
@@ -50,44 +73,6 @@
     The eTLD+1 of a URL that displayed a mixed script shield. Note: this does
     *not* include pages with mixed scripts where the user has already clicked
     through the shield.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Extensions.PossibleAdInjection2" type="ETLD_PLUS_ONE">
-  <owner>rdevlin.cronin@chromium.org</owner>
-  <summary>
-    The eTLD+1 of a URL that might be doing ad injection.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Plugins.FlashOriginUrl" type="ETLD_PLUS_ONE">
-  <owner>wfh@chromium.org</owner>
-  <summary>
-    The domain and registry of the top level URL of a page which attempts to
-    launch a Flash NPAPI or PPAPI plugin, if the client has Flash installed
-    and enabled. Recorded when the plugin frame appears for each Flash object
-    found on the page, even if the plugin is click-to-play.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Plugins.FlashUrl" type="ETLD_PLUS_ONE">
-  <owner>wfh@chromium.org</owner>
-  <summary>
-    The domain and registry of the URL from where Flash SWF or SPL content is
-    being loaded from, while attempting to launch a Flash (NPAPI or PPAPI)
-    plugin that is installed and enabled.  Recorded when the plugin frame
-    appears for each Flash object found in the page, even if the plugin is
-    click-to-play.
-  </summary>
-</rappor-metric>
-
-<rappor-metric name="Plugins.SilverlightOriginUrl" type="ETLD_PLUS_ONE">
-  <owner>wfh@chromium.org</owner>
-  <summary>
-    The domain and registry of the top level URL of a page which attempts to
-    launch a Silverlight NPAPI plugin, if the client has Silverlight installed
-    and enabled. Recorded when the plugin frame appears for each Silverlight
-    object found on the page, even if the plugin is click-to-play.
   </summary>
 </rappor-metric>
 
@@ -124,11 +109,34 @@
   </summary>
 </rappor-metric>
 
-<rappor-metric name="interstitial.harmful.domain" type="COARSE_RAPPOR_TYPE">
-  <owner>nparker@chromium.org</owner>
+<rappor-metric name="Plugins.SilverlightOriginUrl" type="ETLD_PLUS_ONE">
+  <owner>wfh@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that triggered a safe-browsing UWS
-    interstitial.
+    The domain and registry of the top level URL of a page which attempts to
+    launch a Silverlight NPAPI plugin, if the client has Silverlight installed
+    and enabled. Recorded when the plugin frame appears for each Silverlight
+    object found on the page, even if the plugin is click-to-play.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="Plugins.FlashUrl" type="ETLD_PLUS_ONE">
+  <owner>wfh@chromium.org</owner>
+  <summary>
+    The domain and registry of the URL from where Flash SWF or SPL content is
+    being loaded from, while attempting to launch a Flash (NPAPI or PPAPI)
+    plugin that is installed and enabled.  Recorded when the plugin frame
+    appears for each Flash object found in the page, even if the plugin is
+    click-to-play.
+  </summary>
+</rappor-metric>
+
+<rappor-metric name="Plugins.FlashOriginUrl" type="ETLD_PLUS_ONE">
+  <owner>wfh@chromium.org</owner>
+  <summary>
+    The domain and registry of the top level URL of a page which attempts to
+    launch a Flash NPAPI or PPAPI plugin, if the client has Flash installed
+    and enabled. Recorded when the plugin frame appears for each Flash object
+    found on the page, even if the plugin is click-to-play.
   </summary>
 </rappor-metric>
 
@@ -148,11 +156,19 @@
   </summary>
 </rappor-metric>
 
+<rappor-metric name="interstitial.harmful.domain" type="COARSE_RAPPOR_TYPE">
+  <owner>nparker@chromium.org</owner>
+  <summary>
+    The domain+registry of a URL that triggered a safe-browsing UWS
+    interstitial.
+  </summary>
+</rappor-metric>
+
 <rappor-metric name="interstitial.ssl.domain" type="COARSE_RAPPOR_TYPE">
   <owner>nparker@chromium.org</owner>
   <summary>
-    The domain+registry of a URL that triggered an SSL interstitial.     Domains
-    for bad-clock warnings are not reported.
+    The domain+registry of a URL that triggered an SSL interstitial.
+    Domains for bad-clock warnings are not reported.
   </summary>
 </rappor-metric>