Revert "UMA: How often are different network error screens encountered during OOBE"

tools/metrics/histograms/histograms.xml

Index: tools/metrics/histograms/histograms.xml
diff --git a/tools/metrics/histograms/histograms.xml b/tools/metrics/histograms/histograms.xml
index 1dc6c314a8228364995cd78eedcae0e07198315e..bd4077f5978e5e7096dcd2a8cd130e60d6bd7a57 100644
--- a/tools/metrics/histograms/histograms.xml
+++ b/tools/metrics/histograms/histograms.xml
@@ -21222,55 +21222,6 @@ Therefore, the affected-histogram name has to have at least one dot in it.
   <summary>Time from boot to sign-in completed.</summary>
 </histogram>
 
-<histogram name="OOBE.ErrorScreensTime.Enrollment" units="milliseconds">
-  <owner>rsorokin@chromium.org</owner>
-  <summary>
-    Time spent on error screens during enrollment or autoenrollment.
-  </summary>
-</histogram>
-
-<histogram name="OOBE.ErrorScreensTime.Signin" units="milliseconds">
-  <owner>rsorokin@chromium.org</owner>
-  <summary>Time spent on error screens during signin.</summary>
-</histogram>
-
-<histogram name="OOBE.ErrorScreensTime.Supervised" units="milliseconds">
-  <owner>rsorokin@chromium.org</owner>
-  <summary>
-    Time spent on error screens during supervised user creation.
-  </summary>
-</histogram>
-
-<histogram name="OOBE.ErrorScreensTime.Update" units="milliseconds">
-  <owner>rsorokin@chromium.org</owner>
-  <summary>Time spent on error screens during update.</summary>
-</histogram>
-
-<histogram name="OOBE.NetworkErrorShown.Enrollment" enum="NetworkErrorType">
-  <owner>rsorokin@google.com</owner>
-  <summary>
-    Number of times error screen has appeared during enrollment or
-    autoenrollment.
-  </summary>
-</histogram>
-
-<histogram name="OOBE.NetworkErrorShown.Signin" enum="NetworkErrorType">
-  <owner>rsorokin@google.com</owner>
-  <summary>Number of times error screen has appeared during signin.</summary>
-</histogram>
-
-<histogram name="OOBE.NetworkErrorShown.Supervised" enum="NetworkErrorType">
-  <owner>rsorokin@google.com</owner>
-  <summary>
-    Number of times error screen has appeared during supervised user creation.
-  </summary>
-</histogram>
-
-<histogram name="OOBE.NetworkErrorShown.Update" enum="NetworkErrorType">
-  <owner>rsorokin@google.com</owner>
-  <summary>Number of times error screen has appeared during update.</summary>
-</histogram>
-
 <histogram name="OOBE.StepCompletionTime" units="milliseconds">
   <owner>merkulova@chromium.org</owner>
   <summary>Time spent on specific OOBE screen.</summary>
@@ -47264,15 +47215,6 @@ To add a new entry, add it with any value and run test to compute valid value.
   <int value="1" label="User Disconnect"/>
 </enum>
 
-<enum name="NetworkErrorType" type="int">
-  <int value="0" label="Unknown"/>
-  <int value="1" label="Portal"/>
-  <int value="2" label="Offline"/>
-  <int value="3" label="Proxy"/>
-  <int value="4" label="AuthExtTimeout"/>
-  <int value="5" label="None"/>
-</enum>
-
 <enum name="NetworkLocationRequestEvent" type="int">
   <int value="0" label="REQUEST_START"/>
   <int value="1" label="REQUEST_CANCEL"/>
@@ -55388,17 +55330,6 @@ To add a new entry, add it with any value and run test to compute valid value.
   <affected-histogram name="Net.ProxyResolver.ExecutionTime"/>
 </histogram_suffixes>
 
-<histogram_suffixes name="NetworkErrors" separator=".">
-  <suffix name="AuthExtTimeout" label="with the last error AuthExtTimeout"/>
-  <suffix name="Offline" label="with the last error Offline"/>
-  <suffix name="Portal" label="with the last error Portal"/>
-  <suffix name="Proxy" label="with the last error Proxy"/>
-  <affected-histogram name="OOBE.ErrorScreensTime.Enrollment"/>
-  <affected-histogram name="OOBE.ErrorScreensTime.Signin"/>
-  <affected-histogram name="OOBE.ErrorScreensTime.Supervised"/>
-  <affected-histogram name="OOBE.ErrorScreensTime.Update"/>
-</histogram_suffixes>
-
 <histogram_suffixes name="NewTabPageProviders" separator=".">
   <suffix name="client" label="Suggestions coming from the client."/>
   <suffix name="client0" label="Suggestions coming from the client source 0."/>