New encryption/escrow endpoints for Wallet

components/autofill/core/browser/autofill_metrics.h

Index: components/autofill/core/browser/autofill_metrics.h
diff --git a/components/autofill/core/browser/autofill_metrics.h b/components/autofill/core/browser/autofill_metrics.h
index 5fde62c2fbe825d97c874cfd4705d0ed130240ab..5c876601cbbf3b31b1ad1f11f258fcbcecc9cb73 100644
--- a/components/autofill/core/browser/autofill_metrics.h
+++ b/components/autofill/core/browser/autofill_metrics.h
@@ -287,19 +287,21 @@ class AutofillMetrics {
   };
 
   // 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