Fix double escaping of senderIds in registration request.

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 122 matching lines @@
     ASSERT_TRUE(data_tokenizer.GetNext());
     EXPECT_EQ(iter->second, data_tokenizer.token());
     // Ensure that none of the keys appears twice.
     expected_pairs.erase(iter);
   }
 
   EXPECT_EQ(0UL, expected_pairs.size());
 }
 
 TEST_F(RegistrationRequestTest, RequestRegistrationWithMultipleSenderIds) {
-  CreateRequest("sender1,sender2");
+  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(data_tokenizer.token());
+  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", sender_tokenizer.token());
+  EXPECT_EQ("sender2@gmail.com", sender_tokenizer.token());
 }
 
 TEST_F(RegistrationRequestTest, ResponseParsing) {
   CreateRequest("sender1,sender2");
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "token=2501");
   CompleteFetch();
 
   EXPECT_EQ("2501", registration_id_);
@@ skipping 21 matching lines @@
   CreateRequest("sender1,sender2");
   request_->Start();
 
   SetResponseStatusAndString(net::HTTP_OK, "some error in response");
   CompleteFetch();
 
   EXPECT_EQ("", registration_id_);
 }
 
 }  // namespace gcm