GCM Engine: Split up reg/unreg UNKNOWN_ERROR to improve metrics

google_apis/gcm/engine/unregistration_request.h

 // Copyright 2014 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 GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_
 #define GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 22 matching lines @@
 // TODO(fgorski): Consider sharing code with RegistrationRequest if possible.
 class GCM_EXPORT UnregistrationRequest : public net::URLFetcherDelegate {
  public:
   // Outcome of the response parsing. Note that these enums are consumed by a
   // histogram, so ordering should not be modified.
   enum Status {
     SUCCESS,                  // Unregistration completed successfully.
     URL_FETCHING_FAILED,      // URL fetching failed.
     NO_RESPONSE_BODY,         // No response body.
     RESPONSE_PARSING_FAILED,  // Failed to parse a meaningful output from
-                              // response
-                              // body.
+                              // response body.
     INCORRECT_APP_ID,         // App ID returned by the fetcher does not match
                               // request.
     INVALID_PARAMETERS,       // Request parameters were invalid.
     SERVICE_UNAVAILABLE,      // Unregistration service unavailable.
     INTERNAL_SERVER_ERROR,    // Internal server error happened during request.
     HTTP_NOT_OK,              // HTTP response code was not OK.
     UNKNOWN_ERROR,            // Unknown error.
     REACHED_MAX_RETRIES,      // Reached maximum number of retries.
+    DEVICE_REGISTRATION_ERROR,// Chrome is not properly registered.
     // NOTE: Always keep this entry at the end. Add new status types only
     // immediately above this line. Make sure to update the corresponding
     // histogram enum accordingly.
     UNREGISTRATION_STATUS_COUNT,
   };
 
   // Callback completing the unregistration request.
   typedef base::Callback<void(Status success)> UnregistrationCallback;
 
   // Defines the common info about an unregistration/token-deletion request.
@@ skipping 26 matching lines @@
     CustomRequestHandler();
     virtual ~CustomRequestHandler();
 
     // Builds the HTTP request body data. It is called after
     // UnregistrationRequest::BuildRequestBody to append more custom info to
     // |body|. Note that the request body is encoded in HTTP form format.
     virtual void BuildRequestBody(std::string* body) = 0;
 
     // Parses the HTTP response. It is called after
     // UnregistrationRequest::ParseResponse to proceed the parsing.
-    virtual Status ParseResponse(const net::URLFetcher* source) = 0;
+    virtual Status ParseResponse(const std::string& response) = 0;
 
     // Reports various UMAs, including status, retry count and completion time.
     virtual void ReportUMAs(Status status,
                             int retry_count,
                             base::TimeDelta complete_time) = 0;
   };
 
   // Creates an instance of UnregistrationRequest. |callback| will be called
   // once registration has been revoked or there has been an error that makes
   // further retries pointless.
@@ skipping 39 matching lines @@
   std::string source_to_record_;
 
   base::WeakPtrFactory<UnregistrationRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnregistrationRequest);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_