Deprecate HOSTED_NOT_ALLOWED auth error

google_apis/gaia/google_service_auth_error.h

 // Copyright (c) 2012 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.
 
 // A GoogleServiceAuthError is immutable, plain old data representing an
 // error from an attempt to authenticate with a Google service.
 // It could be from Google Accounts itself, or any service using Google
 // Accounts (e.g expired credentials).  It may contain additional data such as
 // captcha or OTP challenges.
 
@@ skipping 56 matching lines @@
     // The service is not available; try again later.
     SERVICE_UNAVAILABLE = 7,
 
     // The password is valid but we need two factor to get a token.
     TWO_FACTOR = 8,
 
     // The requestor of the authentication step cancelled the request
     // prior to completion.
     REQUEST_CANCELED = 9,
 
-    // The user has provided a HOSTED account, when this service requires
-    // a GOOGLE account.
-    HOSTED_NOT_ALLOWED = 10,
+    // HOSTED accounts are deprecated; left in enumeration to match
+    // GoogleServiceAuthError enum in histograms.xml.
+    HOSTED_NOT_ALLOWED_DEPRECATED = 10,
 
     // Indicates the service responded to a request, but we cannot
     // interpret the response.
     UNEXPECTED_SERVICE_RESPONSE = 11,
 
     // Indicates the service responded and response carried details of the
     // application error.
     SERVICE_ERROR = 12,
 
     // The password is valid but web login is required to get a token.
     WEB_LOGIN_REQUIRED = 13,
 
     // The number of known error states.
     NUM_STATES = 14,
   };
 
+  // Number of deprecated states in above enum, used for list size checks.
+  static const int NUM_DEPRECATED_STATES = 1;
+
   // Additional data for CAPTCHA_REQUIRED errors.
   struct Captcha {
     Captcha();
     Captcha(const std::string& token,
             const GURL& audio,
             const GURL& img,
             const GURL& unlock,
             int width,
             int height);
     Captcha(const Captcha& other);
@@ skipping 16 matching lines @@
                  const std::string& prompt,
                  const std::string& alternate,
                  int length);
     SecondFactor(const SecondFactor& other);
     ~SecondFactor();
     // For test only.
     bool operator==(const SecondFactor &b) const;
 
     // Globally identifies the specific second-factor challenge.
     std::string token;
-    // Localised prompt text, eg “Enter the verification code sent to your
-    // phone number ending in XXX”.
+    // Localized prompt text, e.g. "Enter the verification code sent to your
+    // phone number ending in XXX".
     std::string prompt_text;
-    // Localized text describing an alternate option, eg “Get a verification
-    // code in a text message”.
+    // Localized text describing an alternate option, e.g. "Get a verification
+    // code in a text message".

[Greg Levin, 2016/09/08 19:56:35]

Fix typos, replace non-displaying Unicode open/close quotes with ascii quotes.

     std::string alternate_text;
     // Character length for the challenge field.
     int field_length;
   };
 
   // For test only.
   bool operator==(const GoogleServiceAuthError &b) const;
   bool operator!=(const GoogleServiceAuthError &b) const;
 
   // Construct a GoogleServiceAuthError from a State with no additional data.
@@ skipping 63 matching lines @@
                          int image_height);
 
   State state_;
   Captcha captcha_;
   SecondFactor second_factor_;
   int network_error_;
   std::string error_message_;
 };
 
 #endif  // GOOGLE_APIS_GAIA_GOOGLE_SERVICE_AUTH_ERROR_H_