Removed SpdyProxyAuth.State histogram

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

Index: chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
diff --git a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
index 0634dd8214424eb6e075db61fac00ecb8deb129b..532e6ccc6b43349ccd2123abb9719d903a6285df 100644
--- a/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
+++ b/chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc
@@ -24,6 +24,7 @@
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
+#include "content/public/browser/user_metrics.h"

[mmenke, 2013/11/06 19:24:03]

This isn't used.

[bengr, 2013/11/06 19:44:11]

Done.

 #include "jni/DataReductionProxySettings_jni.h"
 #include "net/base/auth.h"
 #include "net/base/host_port_pair.h"
@@ -40,6 +41,8 @@ using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using base::StringPrintf;
+using content::RecordAction;
+using content::UserMetricsAction;

[mmenke, 2013/11/06 19:24:03]

These aren't used.

[bengr, 2013/11/06 19:44:11]

Done.

 
 namespace {
 
@@ -204,12 +207,6 @@ bool DataReductionProxySettingsAndroid::Register(JNIEnv* env) {
   return register_natives_impl_result;
 }
 
-// Metrics methods -- obsolete; see crbug/241518
-void DataReductionProxySettingsAndroid::RecordDataReductionInit() {
-  UMA_HISTOGRAM_ENUMERATION("SpdyProxyAuth.State", CHROME_STARTUP,
-                            NUM_SPDY_PROXY_AUTH_STATE);
-}
-
 void DataReductionProxySettingsAndroid::AddDefaultProxyBypassRules() {
    DataReductionProxySettings::AddDefaultProxyBypassRules();
 
@@ -233,7 +230,6 @@ void DataReductionProxySettingsAndroid::SetProxyConfigs(bool enabled,
   DCHECK(prefs);
   DictionaryPrefUpdate update(prefs, prefs::kProxy);
   base::DictionaryValue* dict = update.Get();
-  // TODO(marq): All of the UMA in here are obsolete.
   if (enabled) {
     // Convert to a data URI and update the PAC settings.
     std::string base64_pac;
@@ -246,29 +242,10 @@ void DataReductionProxySettingsAndroid::SetProxyConfigs(bool enabled,
                     ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT));
     dict->SetString(kProxyBypassList, JoinString(BypassRules(), ", "));
 
-    if (at_startup) {
-      UMA_HISTOGRAM_ENUMERATION("SpdyProxyAuth.State",
-                                SPDY_PROXY_AUTH_ON_AT_STARTUP,
-                                NUM_SPDY_PROXY_AUTH_STATE);
-    } else if (!DataReductionProxySettings::HasTurnedOn()) {
-      // SPDY proxy auth is turned on by user action for the first time in
-      // this session.
-      UMA_HISTOGRAM_ENUMERATION("SpdyProxyAuth.State",
-                                SPDY_PROXY_AUTH_ON_BY_USER,
-                                NUM_SPDY_PROXY_AUTH_STATE);
-      DataReductionProxySettings::SetHasTurnedOn();

[mmenke, 2013/11/06 19:24:03]

If these methods aren't being used any more, they should be removed.

[bengr, 2013/11/06 19:44:11]

Done.

-    }
   } else {
     dict->SetString(kProxyMode, ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
     dict->SetString(kProxyPacURL, "");
     dict->SetString(kProxyBypassList, "");
-
-    if (!at_startup && !DataReductionProxySettings::HasTurnedOff()) {
-      UMA_HISTOGRAM_ENUMERATION("SpdyProxyAuth.State",
-                                SPDY_PROXY_AUTH_OFF_BY_USER,
-                                NUM_SPDY_PROXY_AUTH_STATE);
-      DataReductionProxySettings::SetHasTurnedOff();
-    }
   }
 }