Additional error logs to track webstore response failures.

chrome/browser/chromeos/app_mode/kiosk_app_data.cc

 // Copyright 2013 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/chromeos/app_mode/kiosk_app_data.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/file_util.h"
+#include "base/json/json_writer.h"
 #include "base/memory/ref_counted_memory.h"
 #include "base/prefs/pref_service.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_data_delegate.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/extensions/webstore_data_fetcher.h"
 #include "chrome/browser/extensions/webstore_install_helper.h"
 #include "chrome/browser/image_decoder.h"
@@ skipping 43 matching lines @@
 bool IsValidKioskAppManifest(const extensions::Manifest& manifest) {
   bool kiosk_enabled;
   if (manifest.GetBoolean(extensions::manifest_keys::kKioskEnabled,
                           &kiosk_enabled)) {
     return kiosk_enabled;
   }
 
   return false;
 }
 
+std::string ValueToString(const base::Value* value) {
+  std::string json;
+  base::JSONWriter::Write(value, &json);
+  return json;
+}
+
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 // KioskAppData::IconLoader
 // Loads locally stored icon data and decode it.
 
 class KioskAppData::IconLoader : public ImageDecoder::Delegate {
  public:
   enum LoadResult {
     SUCCESS,
@@ skipping 318 matching lines @@
 }
 
 void KioskAppData::OnWebstoreResponseParseSuccess(
       base::DictionaryValue* webstore_data) {
   // Takes ownership of |webstore_data|.
   scoped_ptr<base::DictionaryValue> data(webstore_data);
 
   webstore_fetcher_.reset();
 
   std::string manifest;
-  if (!webstore_data->GetString(kManifestKey, &manifest)) {
+  if (!CheckResponseKeyValue(data.get(), kManifestKey, &manifest))
+    return;
+
+  if (!CheckResponseKeyValue(data.get(), kLocalizedNameKey, &name_))
+    return;
+
+  std::string icon_url_string;
+  if (!CheckResponseKeyValue(data.get(), kIconUrlKey, &icon_url_string))
+    return;
+
+  GURL icon_url = GURL(extension_urls::GetWebstoreLaunchURL()).Resolve(
+      icon_url_string);
+  if (!icon_url.is_valid()) {
+    LOG(ERROR) << "Webstore response error (icon url): "
+               << ValueToString(data.get());
     OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
     return;
   }
-
-  if (!webstore_data->GetString(kLocalizedNameKey, &name_)) {
-    OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
-    return;
-  }
-
-  std::string icon_url_string;
-  if (!webstore_data->GetString(kIconUrlKey, &icon_url_string)) {
-    OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
-    return;
-  }
-  GURL icon_url = GURL(extension_urls::GetWebstoreLaunchURL()).Resolve(
-      icon_url_string);
-  if (!icon_url.is_valid()) {
-    OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
-    return;
-  }
 
   // WebstoreDataParser deletes itself when done.
   (new WebstoreDataParser(AsWeakPtr()))->Start(app_id_,
                                                manifest,
                                                icon_url,
                                                GetRequestContextGetter());
 }
 
 void KioskAppData::OnWebstoreResponseParseFailure(const std::string& error) {
+  LOG(ERROR) << "Webstore failed for kiosk app " << app_id_
+             << ", " << error;
   webstore_fetcher_.reset();
   SetStatus(STATUS_ERROR);
 }
 
+bool KioskAppData::CheckResponseKeyValue(const base::DictionaryValue* response,
+                                         const char* key,
+                                         std::string* value) {
+  if (!response->GetString(key, value)) {
+    LOG(ERROR) << "Webstore response error (" << key
+               << "): " << ValueToString(response);
+    OnWebstoreResponseParseFailure(kInvalidWebstoreResponseError);
+    return false;
+  }
+  return true;
+}
+
 }  // namespace chromeos