Push API: Don't wait for network when unsubscribing

components/gcm_driver/instance_id/instance_id.h

 // Copyright 2015 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_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 #define COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_
 
 #include <map>
 #include <memory>
 #include <string>
 
 #include "base/callback.h"
 #include "base/macros.h"
 #include "base/memory/weak_ptr.h"
 #include "base/time/time.h"
 
 namespace gcm {
 class GCMDriver;
 }  // namespace gcm
 
 namespace instance_id {
 
 extern const char kGCMScope[];
 
 // Encapsulates Instance ID functionalities that need to be implemented for
 // different platforms. One instance is created per application. Life of
 // Instance ID is managed by the InstanceIDDriver.
 class InstanceID {
  public:
+  // Used in UMA. Can add enum values, but never renumber or delete and reuse.
   enum Result {
     // Successful operation.
-    SUCCESS,
+    SUCCESS = 0,
     // Invalid parameter.
-    INVALID_PARAMETER,
+    INVALID_PARAMETER = 1,
     // Instance ID is disabled.
-    DISABLED,
+    DISABLED = 2,
     // Previous asynchronous operation is still pending to finish.
-    ASYNC_OPERATION_PENDING,
+    ASYNC_OPERATION_PENDING = 3,
     // Network socket error.
-    NETWORK_ERROR,
+    NETWORK_ERROR = 4,
     // Problem at the server.
-    SERVER_ERROR,
+    SERVER_ERROR = 5,
+    // 6 is omitted, in case we ever merge this enum with GCMClient::Result.

[Peter Beverloo, 2017/02/07 18:11:08]

:)

[johnme, 2017/02/08 14:14:36]

Acknowledged.

     // Other errors.
-    UNKNOWN_ERROR
+    UNKNOWN_ERROR = 7,
+
+    // Used for UMA. Keep LAST_RESULT up to date and sync with histograms.xml.
+

[Peter Beverloo, 2017/02/07 18:11:08]

micro nit^2: no newline

[johnme, 2017/02/08 14:14:36]

Done.

+    LAST_RESULT = UNKNOWN_ERROR
   };
 
   // Asynchronous callbacks. Must not synchronously delete |this| (using
   // InstanceIDDriver::RemoveInstanceID).
   typedef base::Callback<void(const std::string& app_id,
                               bool update_id)> TokenRefreshCallback;
   typedef base::Callback<void(const std::string& id)> GetIDCallback;
   typedef base::Callback<void(const base::Time& creation_time)>
       GetCreationTimeCallback;
   typedef base::Callback<void(const std::string& token,
@@ skipping 89 matching lines @@
   TokenRefreshCallback token_refresh_callback_;
 
   base::WeakPtrFactory<InstanceID> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(InstanceID);
 };
 
 }  // namespace instance_id
 
 #endif  // COMPONENTS_GCM_DRIVER_INSTANCE_ID_INSTANCE_ID_H_