New encryption/escrow endpoints for Wallet

components/autofill/core/browser/autofill_metrics.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 COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_
 #define COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_
 
 #include <stddef.h>
 #include <string>
 
@@ skipping 269 matching lines @@
     // Same as above, but only logged once per page load.
     USER_DID_AUTOFILL_ONCE,
     // User edited a previously autofilled field.
     USER_DID_EDIT_AUTOFILLED_FIELD,
     // Same as above, but only logged once per page load.
     USER_DID_EDIT_AUTOFILLED_FIELD_ONCE,
     NUM_USER_HAPPINESS_METRICS,
   };
 
   // For measuring the network request time of various Wallet API calls. See
-  // WalletClient::RequestType.
+  // WalletClient::RequestType. A number of members of this enum have been
+  // deprecated.
   enum WalletApiCallMetric {
     UNKNOWN_API_CALL,  // Catch all. Should never be used.
     ACCEPT_LEGAL_DOCUMENTS,
     AUTHENTICATE_INSTRUMENT,
     GET_FULL_WALLET,
     GET_WALLET_ITEMS,
-    SAVE_ADDRESS,
-    SAVE_INSTRUMENT,
-    SAVE_INSTRUMENT_AND_ADDRESS,
+    DEPRECATED_SAVE_ADDRESS,
+    DEPRECATED_SAVE_INSTRUMENT,
+    DEPRECATED_SAVE_INSTRUMENT_AND_ADDRESS,
     SEND_STATUS,
-    UPDATE_ADDRESS,
-    UPDATE_INSTRUMENT,
+    DEPRECATED_UPDATE_ADDRESS,
+    DEPRECATED_UPDATE_INSTRUMENT,

[Ilya Sherman, 2013/07/02 22:17:45]

Actually, I'm realizing that these constants are only ever used to name
histograms, rather than being values emitted to a histogram.  Given that, it's
fine to remove the deprecated items, and also not to reserve space for their
numeric values.  So, I'd change this whole block to:

// For measuring the network request time of various Wallet API calls. See
// WalletClient::RequestType. A number of members of this enum have been
// deprecated.
enum WalletApiCallMetric {
  ACCEPT_LEGAL_DOCUMENTS,
  AUTHENTICATE_INSTRUMENT,
  GET_FULL_WALLET,
  GET_WALLET_ITEMS,
  SEND_STATUS,
  SAVE_TO_WALLET,
};

Sorry for the misdirection in my previous review.

[ahutter, 2013/07/02 22:26:14]

Np. Done.

+    SAVE_TO_WALLET,
   };
 
   // For measuring the frequency of errors while communicating with the Wallet
   // server.
   enum WalletErrorMetric {
     // Baseline metric: Issued a request to the Wallet server.
     WALLET_ERROR_BASELINE_ISSUED_REQUEST = 0,
     // A fatal error occured while communicating with the Wallet server. This
     // value has been deprecated.
     WALLET_FATAL_ERROR_DEPRECATED,
@@ skipping 189 matching lines @@
   virtual void LogServerExperimentIdForUpload(
       const std::string& experiment_id) const;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AutofillMetrics);
 };
 
 }  // namespace autofill
 
 #endif  // COMPONENTS_AUTOFILL_CORE_BROWSER_AUTOFILL_METRICS_H_