[GCM] API update to allow only a single sender in registration

google_apis/gcm/engine/registration_request_unittest.cc

Index: google_apis/gcm/engine/registration_request_unittest.cc
diff --git a/google_apis/gcm/engine/registration_request_unittest.cc b/google_apis/gcm/engine/registration_request_unittest.cc
index f08c4f4e507cc2b9270c5ad290e63bed685986a4..24bbcd8c09620e056e7b96db434e5dd6726f6492 100644
--- a/google_apis/gcm/engine/registration_request_unittest.cc
+++ b/google_apis/gcm/engine/registration_request_unittest.cc
@@ -100,18 +100,13 @@ void RegistrationRequestTest::RegistrationCallback(
   callback_called_ = true;
 }
 
-void RegistrationRequestTest::CreateRequest(const std::string& sender_ids) {
-  std::vector<std::string> senders;
-  base::StringTokenizer tokenizer(sender_ids, ",");
-  while (tokenizer.GetNext())
-    senders.push_back(tokenizer.token());
-
+void RegistrationRequestTest::CreateRequest(const std::string& sender_id) {
   request_.reset(new RegistrationRequest(
       RegistrationRequest::RequestInfo(kAndroidId,
                                        kSecurityToken,
                                        kAppId,
                                        kCert,
-                                       senders),
+                                       sender_id),
       kDefaultBackoffPolicy,
       base::Bind(&RegistrationRequestTest::RegistrationCallback,
                  base::Unretained(this)),
@@ -140,7 +135,7 @@ void RegistrationRequestTest::CompleteFetch() {
 
 TEST_F(RegistrationRequestTest, RequestSuccessful) {
   set_max_retry_count(0);
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "token=2501");
@@ -194,33 +189,8 @@ TEST_F(RegistrationRequestTest, RequestDataPassedToFetcher) {
   EXPECT_EQ(0UL, expected_pairs.size());
 }
 
-TEST_F(RegistrationRequestTest, RequestRegistrationWithMultipleSenderIds) {
-  CreateRequest("sender1,sender2@gmail.com");
-  request_->Start();
-
-  net::TestURLFetcher* fetcher = url_fetcher_factory_.GetFetcherByID(0);
-  ASSERT_TRUE(fetcher);
-
-  // Verify data was formatted properly.
-  std::string upload_data = fetcher->upload_data();
-  base::StringTokenizer data_tokenizer(upload_data, "&=");
-
-  // Skip all tokens until you hit entry for senders.
-  while (data_tokenizer.GetNext() && data_tokenizer.token() != "sender")
-    continue;
-
-  ASSERT_TRUE(data_tokenizer.GetNext());
-  std::string senders(net::UnescapeURLComponent(data_tokenizer.token(),
-      net::UnescapeRule::URL_SPECIAL_CHARS));
-  base::StringTokenizer sender_tokenizer(senders, ",");
-  ASSERT_TRUE(sender_tokenizer.GetNext());
-  EXPECT_EQ("sender1", sender_tokenizer.token());
-  ASSERT_TRUE(sender_tokenizer.GetNext());
-  EXPECT_EQ("sender2@gmail.com", sender_tokenizer.token());
-}
-
 TEST_F(RegistrationRequestTest, ResponseParsing) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "token=2501");
@@ -232,7 +202,7 @@ TEST_F(RegistrationRequestTest, ResponseParsing) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseHttpStatusNotOK) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_UNAUTHORIZED, "token=2501");
@@ -249,7 +219,7 @@ TEST_F(RegistrationRequestTest, ResponseHttpStatusNotOK) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseMissingRegistrationId) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "");
@@ -272,7 +242,7 @@ TEST_F(RegistrationRequestTest, ResponseMissingRegistrationId) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseDeviceRegistrationError) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "Error=PHONE_REGISTRATION_ERROR");
@@ -290,7 +260,7 @@ TEST_F(RegistrationRequestTest, ResponseDeviceRegistrationError) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseAuthenticationError) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_UNAUTHORIZED,
@@ -309,7 +279,7 @@ TEST_F(RegistrationRequestTest, ResponseAuthenticationError) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseInvalidParameters) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "Error=INVALID_PARAMETERS");
@@ -321,7 +291,7 @@ TEST_F(RegistrationRequestTest, ResponseInvalidParameters) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseInvalidSender) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "Error=INVALID_SENDER");
@@ -345,7 +315,7 @@ TEST_F(RegistrationRequestTest, ResponseInvalidSenderBadRequest) {
 }
 
 TEST_F(RegistrationRequestTest, RequestNotSuccessful) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   net::URLRequestStatus request_status(net::URLRequestStatus::FAILED, 1);
@@ -368,7 +338,7 @@ TEST_F(RegistrationRequestTest, RequestNotSuccessful) {
 }
 
 TEST_F(RegistrationRequestTest, ResponseHttpNotOk) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_GATEWAY_TIMEOUT, "token=2501");
@@ -387,7 +357,7 @@ TEST_F(RegistrationRequestTest, ResponseHttpNotOk) {
 
 TEST_F(RegistrationRequestTest, MaximumAttemptsReachedWithZeroRetries) {
   set_max_retry_count(0);
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_GATEWAY_TIMEOUT, "token=2501");
@@ -399,7 +369,7 @@ TEST_F(RegistrationRequestTest, MaximumAttemptsReachedWithZeroRetries) {
 }
 
 TEST_F(RegistrationRequestTest, MaximumAttemptsReached) {
-  CreateRequest("sender1,sender2");
+  CreateRequest(kDeveloperId);
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_GATEWAY_TIMEOUT, "token=2501");