Improve logging for PermissionRequestCreatorApiary errors.

chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.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 "chrome/browser/supervised_user/child_accounts/permission_request_creator_apiary.h"
 
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
@@ skipping 181 matching lines @@
   std::string body;
   base::JSONWriter::Write(dict, &body);
   (*it)->url_fetcher->SetUploadData("application/json", body);
 
   (*it)->url_fetcher->Start();
 }
 
 void PermissionRequestCreatorApiary::OnGetTokenFailure(
     const OAuth2TokenService::Request* request,
     const GoogleServiceAuthError& error) {
-  VLOG(1) << "Couldn't get token";
   RequestIterator it = requests_.begin();
   while (it != requests_.end()) {
     if (request == (*it)->access_token_request.get())
       break;
     ++it;
   }
   DCHECK(it != requests_.end());
-  (*it)->callback.Run(false);
-  requests_.erase(it);
+  LOG(WARNING) << "Token error: " << error.ToString();
+  DispatchResult(it, false);
 }
 
 void PermissionRequestCreatorApiary::OnURLFetchComplete(
     const URLFetcher* source) {
   RequestIterator it = requests_.begin();
   while (it != requests_.end()) {
     if (source == (*it)->url_fetcher.get())
       break;
     ++it;
   }
   DCHECK(it != requests_.end());
 
   const net::URLRequestStatus& status = source->GetStatus();
   if (!status.is_success()) {
-    DispatchNetworkError(it, status.error());
+    LOG(WARNING) << "Network error " << status.error();
+    DispatchResult(it, false);
     return;
   }
 
   int response_code = source->GetResponseCode();
   if (response_code == net::HTTP_UNAUTHORIZED && !(*it)->access_token_expired) {
     (*it)->access_token_expired = true;
     OAuth2TokenService::ScopeSet scopes;
     scopes.insert(GetApiScope());
     oauth2_token_service_->InvalidateAccessToken(account_id_, scopes,
                                                  (*it)->access_token);
     StartFetching(*it);
     return;
   }
 
   if (response_code != net::HTTP_OK) {
     LOG(WARNING) << "HTTP error " << response_code;
-    DispatchGoogleServiceAuthError(
-        it, GoogleServiceAuthError(GoogleServiceAuthError::CONNECTION_FAILED));
+    DispatchResult(it, false);
     return;
   }
 
   std::string response_body;
   source->GetResponseAsString(&response_body);
   scoped_ptr<base::Value> value = base::JSONReader::Read(response_body);
   base::DictionaryValue* dict = NULL;
   if (!value || !value->GetAsDictionary(&dict)) {
-    DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
+    LOG(WARNING) << "Invalid top-level dictionary";
+    DispatchResult(it, false);
     return;
   }
   base::DictionaryValue* permission_dict = NULL;
   if (!dict->GetDictionary(kPermissionRequestKey, &permission_dict)) {
-    DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
+    LOG(WARNING) << "Permission request not found";
+    DispatchResult(it, false);
     return;
   }
   std::string id;
   if (!permission_dict->GetString(kIdKey, &id)) {
-    DispatchNetworkError(it, net::ERR_INVALID_RESPONSE);
+    LOG(WARNING) << "Key not found";

[Marc Treib, 2015/09/23 14:23:31]

s/Key/ID/g

[Bernhard Bauer, 2015/09/23 15:10:03]

Done.

+    DispatchResult(it, false);
     return;
   }
-  (*it)->callback.Run(true);
+  DispatchResult(it, true);
+}
+
+void PermissionRequestCreatorApiary::DispatchResult(RequestIterator it,
+                                                    bool success) {
+  (*it)->callback.Run(success);
   requests_.erase(it);
 }
-
-void PermissionRequestCreatorApiary::DispatchNetworkError(RequestIterator it,
-                                                          int error_code) {
-  DispatchGoogleServiceAuthError(
-      it, GoogleServiceAuthError::FromConnectionError(error_code));
-}
-
-void PermissionRequestCreatorApiary::DispatchGoogleServiceAuthError(
-    RequestIterator it,
-    const GoogleServiceAuthError& error) {
-  VLOG(1) << "GoogleServiceAuthError: " << error.ToString();
-  (*it)->callback.Run(false);
-  requests_.erase(it);
-}