Removed SpdyProxyAuth.State histogram

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h"
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/base64.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_member.h"
 #include "base/prefs/pref_service.h"
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
 #include "chrome/browser/profiles/profile.h"
 #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"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
 #include "net/url_request/url_fetcher.h"
 #include "net/url_request/url_fetcher_delegate.h"
 #include "net/url_request/url_request_status.h"
 #include "url/gurl.h"
 
 using base::android::CheckException;
 using base::android::ConvertJavaStringToUTF8;
 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 {
 
 // The C++ definition of enum SpdyProxyAuthState defined in
 // tools/histograms/histograms.xml.
 // New values should be added at the end before |NUM_SPDY_PROXY_AUTH_STATE|.
 enum {
   CHROME_STARTUP,
   SPDY_PROXY_AUTH_ON_AT_STARTUP,
   SPDY_PROXY_AUTH_ON_BY_USER,
@@ skipping 144 matching lines @@
     JNIEnv* env, jobject obj) {
   return GetDailyContentLengths(env, prefs::kDailyHttpReceivedContentLength);
 }
 
 // static
 bool DataReductionProxySettingsAndroid::Register(JNIEnv* env) {
   bool register_natives_impl_result = RegisterNativesImpl(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();
 
   // TODO(bengr): See http://crbug.com/169959. For some reason the data
   // reduction proxy is breaking the omnibox SearchProvider.  Remove this rule
   // when this is fixed.
   AddURLPatternToBypass("http://www.google.com/complete/search*");
 }
 
 void DataReductionProxySettingsAndroid::SetProxyConfigs(bool enabled,
                                                         bool at_startup) {
   // Keys duplicated from proxy_config_dictionary.cc
   // TODO(bengr): Move these to proxy_config_dictionary.h and reuse them here.
   const char kProxyMode[] = "mode";
   const char kProxyPacURL[] = "pac_url";
   const char kProxyBypassList[] = "bypass_list";
 
   LogProxyState(enabled, at_startup);
 
   PrefService* prefs = GetOriginalProfilePrefs();
   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;
     base::Base64Encode(GetProxyPacScript(), &base64_pac);
 
     dict->SetString(kProxyPacURL,
                     "data:application/x-ns-proxy-autoconfig;base64," +
                     base64_pac);
     dict->SetString(kProxyMode,
                     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();
-    }
   }
 }
 
 ScopedJavaLocalRef<jlongArray>
 DataReductionProxySettingsAndroid::GetDailyContentLengths(
     JNIEnv* env,  const char* pref_name) {
   jlongArray result = env->NewLongArray(spdyproxy::kNumDaysInHistory);
 
   DataReductionProxySettings::ContentLengthList lengths  =
       DataReductionProxySettings::GetDailyContentLengths(pref_name);
@@ skipping 33 matching lines @@
       "}";
   return pac;
 }
 
 // Used by generated jni code.
 static jint Init(JNIEnv* env, jobject obj) {
   DataReductionProxySettingsAndroid* settings =
       new DataReductionProxySettingsAndroid(env, obj);
   return reinterpret_cast<jint>(settings);
 }