Remove most uses of UnescapeRule::URL_SPECIAL_CHARS outside net/.

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 <stdint.h>
 #include <map>
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 163 matching lines @@
 
   // 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));
+  std::string senders(net::UnescapeURLComponent(
+      data_tokenizer.token(),
+      net::UnescapeRule::PATH_SEPARATORS |
+          net::UnescapeRule::URL_SPECIAL_CHARS_EXCEPT_PATH_SEPARATORS));
   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(GCMRegistrationRequestTest, ResponseParsing) {
   CreateRequest("sender1,sender2");
   request_->Start();
@@ skipping 316 matching lines @@
 
   SetResponse(net::HTTP_OK, "token=2501");
   CompleteFetch();
 
   EXPECT_TRUE(callback_called_);
   EXPECT_EQ(RegistrationRequest::SUCCESS, status_);
   EXPECT_EQ("2501", registration_id_);
 }
 
 }  // namespace gcm