Support getting and deleting token for Instance ID.

google_apis/gcm/engine/registration_request_unittest.cc

 // 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.
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 84 matching lines @@
 RegistrationRequestTest::~RegistrationRequestTest() {}
 
 void RegistrationRequestTest::RegistrationCallback(
     RegistrationRequest::Status status,
     const std::string& registration_id) {
   status_ = status;
   registration_id_ = registration_id;
   callback_called_ = true;
 }
 
 void RegistrationRequestTest::CreateRequest(const std::string& sender_ids) {

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

How about adding tests for Instance ID specific code?

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

Done.

   std::vector<std::string> senders;
   base::StringTokenizer tokenizer(sender_ids, ",");
   while (tokenizer.GetNext())
     senders.push_back(tokenizer.token());
 
+  scoped_ptr<RegistrationRequest::GCMRequestInfo> gcm_request_info(
+      new RegistrationRequest::GCMRequestInfo);
+  gcm_request_info->android_id = kAndroidId;
+  gcm_request_info->security_token = kSecurityToken;
+  gcm_request_info->app_id = kAppId;
+  gcm_request_info->sender_ids = senders;
   request_.reset(new RegistrationRequest(
       GURL(kRegistrationURL),
-      RegistrationRequest::RequestInfo(kAndroidId,
-                                       kSecurityToken,
-                                       kAppId,
-                                       senders),
+      gcm_request_info.Pass(),
       kDefaultBackoffPolicy,
       base::Bind(&RegistrationRequestTest::RegistrationCallback,
                  base::Unretained(this)),
       max_retry_count_,
       url_request_context_getter_.get(),
       &recorder_));
 }
 
 void RegistrationRequestTest::SetResponseStatusAndString(
     net::HttpStatusCode status_code,
@@ skipping 291 matching lines @@
 
   SetResponseStatusAndString(net::HTTP_GATEWAY_TIMEOUT, "token=2501");
   CompleteFetch();
 
   EXPECT_TRUE(callback_called_);
   EXPECT_EQ(RegistrationRequest::REACHED_MAX_RETRIES, status_);
   EXPECT_EQ(std::string(), registration_id_);
 }
 
 }  // namespace gcm