Support getting and deleting token for Instance ID.

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 "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/ref_counted.h"
@@ skipping 39 matching lines @@
     // 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;
 
   // Details of the of the Unregistration Request. All parameters are mandatory.
   struct GCM_EXPORT RequestInfo {
-    RequestInfo(uint64 android_id,
-                uint64 security_token,
-                const std::string& app_id);
-    ~RequestInfo();
+    RequestInfo();
+    virtual ~RequestInfo();
 
+    virtual void BuildRequestHeaders(std::string* extra_headers);
+    virtual void BuildRequestBody(std::string* body);
+
+    // Version to pass.
+    std::string chrome_version;
     // Android ID of the device.
     uint64 android_id;
     // Security token of the device.
     uint64 security_token;
     // Application ID.
     std::string app_id;
   };
 
+  // GCM registration request.
+  struct GCM_EXPORT GCMRequestInfo : public RequestInfo {
+    GCMRequestInfo();
+    ~GCMRequestInfo() override;
+
+    // RequestInfo overrides:
+    void BuildRequestBody(std::string* body) override;
+  };
+
+  // GCM token request.

[fgorski, 2015/05/13 18:32:41]

Instance ID token request

[jianli, 2015/05/13 22:42:57]

Done.

+  struct GCM_EXPORT InstanceIDRequestInfo : public RequestInfo {
+    InstanceIDRequestInfo();
+    ~InstanceIDRequestInfo() override;
+
+    // RequestInfo overrides:
+    void BuildRequestBody(std::string* body) override;
+
+    std::string instance_id;
+    std::string authorized_entity;
+    std::string scope;
+  };
+
   // 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.
   UnregistrationRequest(
       const GURL& registration_url,
-      const RequestInfo& request_info,
+      scoped_ptr<RequestInfo> request_info,
       const net::BackoffEntry::Policy& backoff_policy,
       const UnregistrationCallback& callback,
       scoped_refptr<net::URLRequestContextGetter> request_context_getter,
       GCMStatsRecorder* recorder);
   ~UnregistrationRequest() override;
 
   // Starts an unregistration request.
   void Start();
 
   // URLFetcherDelegate implementation.
   void OnURLFetchComplete(const net::URLFetcher* source) override;
 
  private:
   // Schedules a retry attempt and informs the backoff of previous request's
   // failure, when |update_backoff| is true.
   void RetryWithBackoff(bool update_backoff);
 
   UnregistrationCallback callback_;
-  RequestInfo request_info_;
+  scoped_ptr<RequestInfo> request_info_;
   GURL registration_url_;
 
   net::BackoffEntry backoff_entry_;
   scoped_refptr<net::URLRequestContextGetter> request_context_getter_;
   scoped_ptr<net::URLFetcher> url_fetcher_;
   base::TimeTicks request_start_time_;
 
   // Recorder that records GCM activities for debugging purpose. Not owned.
   GCMStatsRecorder* recorder_;
 
   base::WeakPtrFactory<UnregistrationRequest> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(UnregistrationRequest);
 };
 
 }  // namespace gcm
 
 #endif  // GOOGLE_APIS_GCM_ENGINE_UNREGISTRATION_REQUEST_H_