Some error handling for instanceID.deleteToken

Support the following error checks:
1) Check if the token to be deleted exist in the cache first.
2) Check error in DeleteToken response.

BUG=501627
TEST=new tests

Review URL: https://codereview.chromium.org/1191653012

Cr-Commit-Position: refs/heads/master@{#335762}

2 files changed, 32 insertions, 0 deletions

diff --git a/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc b/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc
index 82de88a..530d785 100644
--- a/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc
+++ b/google_apis/gcm/engine/instance_id_delete_token_request_handler.cc
@@ -23,6 +23,8 @@ const char kScopeKey[] = "scope";
 
 // Response constants.
 const char kTokenPrefix[] = "token=";
+const char kErrorPrefix[] = "Error=";
+const char kInvalidParameters[] = "INVALID_PARAMETERS";
 
 }  // namespace
 
@@ -61,6 +63,14 @@ InstanceIDDeleteTokenRequestHandler::ParseResponse(
     return UnregistrationRequest::NO_RESPONSE_BODY;
   }
 
+  if (response.find(kErrorPrefix) != std::string::npos) {
+    std::string error = response.substr(
+        response.find(kErrorPrefix) + arraysize(kErrorPrefix) - 1);
+    return error == kInvalidParameters ?
+        UnregistrationRequest::INVALID_PARAMETERS :
+        UnregistrationRequest::UNKNOWN_ERROR;
+  }
+
   if (response.find(kTokenPrefix) == std::string::npos)
     return UnregistrationRequest::RESPONSE_PARSING_FAILED;
 
diff --git a/google_apis/gcm/engine/unregistration_request_unittest.cc b/google_apis/gcm/engine/unregistration_request_unittest.cc
index 3f58788..757f46d 100644
--- a/google_apis/gcm/engine/unregistration_request_unittest.cc
+++ b/google_apis/gcm/engine/unregistration_request_unittest.cc
@@ -478,4 +478,26 @@ TEST_F(InstaceIDDeleteTokenRequestTest, ResponseHttpStatusNotOK) {
   EXPECT_EQ(UnregistrationRequest::SUCCESS, status_);
 }
 
+TEST_F(InstaceIDDeleteTokenRequestTest, InvalidParametersError) {
+  CreateRequest(kInstanceId, kDeveloperId, kScope);
+  request_->Start();
+
+  SetResponseStatusAndString(net::HTTP_OK, "Error=INVALID_PARAMETERS");
+  CompleteFetch();
+
+  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(UnregistrationRequest::INVALID_PARAMETERS, status_);
+}
+
+TEST_F(InstaceIDDeleteTokenRequestTest, UnkwnownError) {
+  CreateRequest(kInstanceId, kDeveloperId, kScope);
+  request_->Start();
+
+  SetResponseStatusAndString(net::HTTP_OK, "Error=XXX");
+  CompleteFetch();
+
+  EXPECT_TRUE(callback_called_);
+  EXPECT_EQ(UnregistrationRequest::UNKNOWN_ERROR, status_);
+}
+
 }  // namespace gcm