Removed SpdyProxyAuth.State histogram

The change to UMA aligns metrics for the data reduction proxy on
Android and iOS.

BUG=241518

Review URL: https://codereview.chromium.org/59113012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233507 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/net/spdyproxy/data_reduction_proxy_settings.cc

@@ -76,9 +76,7 @@ bool IsProxyOriginSetOnCommandLine() {
 }  // namespace
 
 DataReductionProxySettings::DataReductionProxySettings()
-    : has_turned_on_(false),
-      has_turned_off_(false),
-      disabled_by_carrier_(false),
+    : disabled_by_carrier_(false),
       enabled_by_user_(false) {
 }
 

chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h

@@ -159,12 +159,6 @@ class DataReductionProxySettings
   // customer feedback. Virtual so tests can mock it for verification.
   virtual void LogProxyState(bool enabled, bool at_startup);
 
-  bool HasTurnedOn() { return has_turned_on_; }
-  bool HasTurnedOff() { return has_turned_off_; }
-  // Note that these flags may only be toggled to true, never back to false.
-  void SetHasTurnedOn() { has_turned_on_ = true; }
-  void SetHasTurnedOff() { has_turned_off_ = true; }
-
   // Accessor for unit tests.
   std::vector<std::string> BypassRules() { return bypass_rules_;}
 
@@ -224,14 +218,6 @@ class DataReductionProxySettings
 
   std::vector<std::string> bypass_rules_;
 
-  // Indicate whether a user has turned on the data reduction proxy previously
-  // in this session.
-  bool has_turned_on_;
-
-  // Indicate whether a user has turned off the data reduction proxy previously
-  // in this session.
-  bool has_turned_off_;
-
   bool disabled_by_carrier_;
   bool enabled_by_user_;
 

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.cc

@@ -204,12 +204,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 +227,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 +239,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();
-    }
   } 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();
-    }
   }
 }
 

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_android.h

@@ -85,8 +85,6 @@ class DataReductionProxySettingsAndroid : public DataReductionProxySettings {
   // file.
   virtual void SetProxyConfigs(bool enabled, bool at_startup) OVERRIDE;
 
-  virtual void RecordDataReductionInit() OVERRIDE;
-
  private:
   friend class DataReductionProxySettingsAndroidTest;
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxySettingsAndroidTest,

chrome/browser/net/spdyproxy/data_reduction_proxy_settings_unittest_android.cc

@@ -92,14 +92,10 @@ TEST_F(DataReductionProxySettingsAndroidTest, TestSetProxyPac) {
   base::Base64Encode(raw_pac, &pac);
   std::string expected_pac_url =
       "data:application/x-ns-proxy-autoconfig;base64," + pac;
-  // Test setting the PAC, without generating histograms.
-  Settings()->SetHasTurnedOn();
   Settings()->SetProxyConfigs(true, false);
   CheckProxyPacPref(expected_pac_url,
                     ProxyModeToString(ProxyPrefs::MODE_PAC_SCRIPT));
 
-  // Test disabling the PAC, without generating histograms.
-  Settings()->SetHasTurnedOff();
   Settings()->SetProxyConfigs(false, false);
   CheckProxyPacPref(std::string(), ProxyModeToString(ProxyPrefs::MODE_SYSTEM));
 }