Metrics fix for data reduction proxy.

chrome/browser/net/spdyproxy/data_reduction_proxy_settings.h

 // 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.
 
 #ifndef CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_H_
 #define CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
@@ skipping 19 matching lines @@
 
 // The number of days of bandwidth usage statistics that are tracked.
 const unsigned int kNumDaysInHistory = 60;
 
 // The number of days of bandwidth usage statistics that are presented.
 const unsigned int kNumDaysInHistorySummary = 30;
 
 COMPILE_ASSERT(kNumDaysInHistorySummary <= kNumDaysInHistory,
                DataReductionProxySettings_summary_too_long);
 
+  // Values of the UMA DataReductionProxy.StartupState histogram.

[bengr, 2014/01/02 17:30:40]

Must this enum stay in sync with something in histograms.xml? If so, add a
comment like the one for ProbeURLFetchResult.

[marq (ping after 24h), 2014/01/02 20:45:47]

Done.

+  enum ProxyStartupState {
+    PROXY_NOT_AVAILABLE = 0,
+    PROXY_DISABLED,
+    PROXY_ENABLED,
+    PROXY_STARTUP_STATE_COUNT,
+  };
+
+  // Values of the UMA DataReductionProxy.ProbeURL histogram.
+  // This enum must remain synchronized with DataReductionProxyProbeURLFetchResult

[marq (ping after 24h), 2014/01/02 20:45:47]

Done.

+  // in metrics/histograms/histograms.xml.
+  // These names are misleading -- for 'DISABLED', read 'RESTRICTED'.

[bengr, 2014/01/02 17:30:40]

Why aren't we just changing these to 'RESTRICTED' ?

[marq (ping after 24h), 2014/01/02 20:45:47]

Mostly because I didn't want to propagate the rename to histograms.xml and break
any metrics queries that used them.

[bengr, 2014/01/06 16:51:23]

Please add a TODO to rename.

+  enum ProbeURLFetchResult {
+    // The probe failed because the internet was disconnected.
+    INTERNET_DISCONNECTED = 0,
+
+    // The probe failed for any other reason, and as a result, the proxy was
+    // disabled.
+    FAILED_PROXY_DISABLED,
+
+    // The probe failed, but the proxy was already restricted.
+    FAILED_PROXY_ALREADY_DISABLED,
+
+    // THe probe succeeded, and as a result the proxy was restricted.
+    SUCCEEDED_PROXY_ENABLED,
+
+    // The probe succeeded, but the proxy was already restricted.
+    SUCCEEDED_PROXY_ALREADY_ENABLED,
+
+    // This must always be last.
+    FETCH_RESULT_COUNT

[bengr, 2014/01/02 17:30:40]

Rename to PROBE_URL_FETCH_RESULT_COUNT?

[marq (ping after 24h), 2014/01/02 20:45:47]

Done.

+  };
+
 }  // namespace spdyproxy
 
 // Central point for configuring the data reduction proxy.
 // This object lives on the UI thread and all of its methods are expected to
 // be called from there.
 // TODO(marq): Convert this to be a BrowserContextKeyedService with an
 // associated factory class, and refactor the Java call sites accordingly.
 class DataReductionProxySettings
     : public net::URLFetcherDelegate,
       public net::NetworkChangeNotifier::IPAddressObserver {
  public:
   typedef std::vector<long long> ContentLengthList;
   // TODO(marq): Consider instead using a std::pair instead of a vector.
   typedef std::vector<GURL> DataReductionProxyList;
 
+

[bengr, 2014/01/02 17:30:40]

Remove extra blank line.

[marq (ping after 24h), 2014/01/02 20:45:47]

Done.

   DataReductionProxySettings();
   virtual ~DataReductionProxySettings();
 
   void InitDataReductionProxySettings();
 
   // If proxy authentication is compiled in, pre-cache authentication
   // keys for all configured proxies in |session|.
   static void InitDataReductionProxySession(net::HttpNetworkSession* session);
 
   // Add a host pattern to bypass. This should follow the same syntax used
@@ skipping 100 matching lines @@
 
   virtual void AddDefaultProxyBypassRules();
 
   // Writes a warning to the log that is used in backend processing of
   // customer feedback. Virtual so tests can mock it for verification.
   virtual void LogProxyState(bool enabled, bool restricted, bool at_startup);
 
   // Accessor for unit tests.
   std::vector<std::string> BypassRules() { return bypass_rules_;}
 
+  // Virtualzied for mocking

[bengr, 2014/01/02 17:30:40]

spelling.

[marq (ping after 24h), 2014/01/02 20:45:47]

Done.

+  virtual void RecordProbeURLFetchResult(spdyproxy::ProbeURLFetchResult result);
+  virtual void RecordStartupState(spdyproxy::ProxyStartupState state);
+
+
  private:
   friend class DataReductionProxySettingsTestBase;
   friend class DataReductionProxySettingsTest;
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxySettingsTest,
                            TestAuthenticationInit);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxySettingsTest,
                            TestAuthHashGeneration);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxySettingsTest,
                            TestAuthHashGenerationWithOriginSetViaSwitch);
   FRIEND_TEST_ALL_PREFIXES(DataReductionProxySettingsTest,
@@ skipping 46 matching lines @@
   bool restricted_by_carrier_;
   bool enabled_by_user_;
 
   scoped_ptr<net::URLFetcher> fetcher_;
   BooleanPrefMember spdy_proxy_auth_enabled_;
 
   DISALLOW_COPY_AND_ASSIGN(DataReductionProxySettings);
 };
 
 #endif  // CHROME_BROWSER_NET_SPDYPROXY_DATA_REDUCTION_PROXY_SETTINGS_H_