Revert of Fix UMA to track video data usage.

components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc

Index: components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc
diff --git a/components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc b/components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc
index 81529633a155c0b9c724e846a4b96fc4d3a9040e..cdb096e113ddc55b0e205be2da696d442f35279c 100644
--- a/components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc
+++ b/components/data_reduction_proxy/core/common/data_reduction_proxy_pref_names.cc
@@ -36,45 +36,9 @@
     "data_reduction.daily_received_length_via_data_reduction_proxy";
 
 // A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with application mime-type received via the data reduction proxy.
-const char kDailyContentLengthViaDataReductionProxyApplication[] =
-    "data_reduction.daily_received_length_via_data_reduction_proxy_application";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with video mime-type received via the data reduction proxy.
-const char kDailyContentLengthViaDataReductionProxyVideo[] =
-    "data_reduction.daily_received_length_via_data_reduction_proxy_video";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with unknown mime-type received via the data reduction proxy.
-const char kDailyContentLengthViaDataReductionProxyUnknown[] =
-    "data_reduction.daily_received_length_via_data_reduction_proxy_unknown";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
 // content received while the data reduction proxy is enabled.
 const char kDailyContentLengthWithDataReductionProxyEnabled[] =
     "data_reduction.daily_received_length_with_data_reduction_proxy_enabled";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with application mime-type received while the data reduction proxy is
-// enabled.
-const char kDailyContentLengthWithDataReductionProxyEnabledApplication[] =
-    "data_reduction.daily_received_length_with_data_reduction_proxy_enabled_"
-    "application";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with video mime-type received while the data reduction proxy is
-// enabled.
-const char kDailyContentLengthWithDataReductionProxyEnabledVideo[] =
-    "data_reduction.daily_received_length_with_data_reduction_proxy_enabled_"
-    "video";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS
-// content with unknown mime-type received while the data reduction proxy is
-// enabled.
-const char kDailyContentLengthWithDataReductionProxyEnabledUnknown[] =
-    "data_reduction.daily_received_length_with_data_reduction_proxy_enabled_"
-    "unknown";
 
 // An int64 pref that contains an internal representation of midnight on the
 // date of the last update to |kDailyHttp{Original,Received}ContentLength|.
@@ -86,40 +50,10 @@
 const char kDailyHttpOriginalContentLength[] =
     "data_reduction.daily_original_length";
 
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with application mime-type received from the network.
-const char kDailyHttpOriginalContentLengthApplication[] =
-    "data_reduction.daily_original_length_application";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with video mime-type received from the network.
-const char kDailyHttpOriginalContentLengthVideo[] =
-    "data_reduction.daily_original_length_video";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with unknown mime-type received from the network.
-const char kDailyHttpOriginalContentLengthUnknown[] =
-    "data_reduction.daily_original_length_unknown";
-
 // A List pref that contains daily totals of the size of all HTTP/HTTPS content
 // received from the network.
 const char kDailyHttpReceivedContentLength[] =
     "data_reduction.daily_received_length";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS content
-// received with application mime-type  from the network.
-const char kDailyHttpReceivedContentLengthApplication[] =
-    "data_reduction.daily_received_length_application";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS content
-// received with video mime-type from the network.
-const char kDailyHttpReceivedContentLengthVideo[] =
-    "data_reduction.daily_received_length_video";
-
-// A List pref that contains daily totals of the size of all HTTP/HTTPS content
-// received with unknown mime-type  from the network.
-const char kDailyHttpReceivedContentLengthUnknown[] =
-    "data_reduction.daily_received_length_unknown";
 
 // A List pref that contains daily totals of the original size of all HTTP/HTTPS
 // content received via the data reduction proxy.
@@ -127,46 +61,9 @@
     "data_reduction.daily_original_length_via_data_reduction_proxy";
 
 // A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with application mime-type received via the data reduction proxy.
-const char kDailyOriginalContentLengthViaDataReductionProxyApplication[] =
-    "data_reduction.daily_original_length_via_data_reduction_proxy_application";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with video mime-type received via the data reduction proxy.
-const char kDailyOriginalContentLengthViaDataReductionProxyVideo[] =
-    "data_reduction.daily_original_length_via_data_reduction_proxy_video";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with unknown mime-type received via the data reduction proxy.
-const char kDailyOriginalContentLengthViaDataReductionProxyUnknown[] =
-    "data_reduction.daily_original_length_via_data_reduction_proxy_unknown";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
 // content received while the data reduction proxy is enabled.
 const char kDailyOriginalContentLengthWithDataReductionProxyEnabled[] =
     "data_reduction.daily_original_length_with_data_reduction_proxy_enabled";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with application mime type received while the data reduction proxy is
-// enabled.
-const char
-    kDailyOriginalContentLengthWithDataReductionProxyEnabledApplication[] =
-        "data_reduction.daily_original_length_with_data_reduction_proxy_"
-        "enabled_application";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with video mime type received while the data reduction proxy is
-// enabled.
-const char kDailyOriginalContentLengthWithDataReductionProxyEnabledVideo[] =
-    "data_reduction.daily_original_length_with_data_reduction_proxy_enabled_"
-    "video";
-
-// A List pref that contains daily totals of the original size of all HTTP/HTTPS
-// content with unknown mime type received while the data reduction proxy is
-// enabled.
-const char kDailyOriginalContentLengthWithDataReductionProxyEnabledUnknown[] =
-    "data_reduction.daily_original_length_with_data_reduction_proxy_enabled_"
-    "unknown";
 
 // String that specifies the origin allowed to use data reduction proxy
 // authentication, if any.