Make the error messages for manifest parsing a little friendlier.

BUG=None
TEST=None

Review URL: http://codereview.chromium.org/507057

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35174 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 6 deletions

diff --git a/chrome/common/extensions/update_manifest.cc b/chrome/common/extensions/update_manifest.cc
index b4c32b1..915020b 100644
--- a/chrome/common/extensions/update_manifest.cc
+++ b/chrome/common/extensions/update_manifest.cc
@@ -124,11 +124,11 @@ static bool ParseSingleAppTag(xmlNode* app_node, xmlNs* xml_namespace,
   std::vector<xmlNode*> updates = GetChildren(app_node, xml_namespace,
                                               "updatecheck");
   if (updates.size() > 1) {
-    *error_detail = "Too many updatecheck tags on app (expecting only 1)";
+    *error_detail = "Too many updatecheck tags on app (expecting only 1).";
     return false;
   }
   if (updates.size() == 0) {
-    *error_detail = "Missing updatecheck on app";
+    *error_detail = "Missing updatecheck on app.";
     return false;
   }
   xmlNode *updatecheck = updates[0];
@@ -136,19 +136,23 @@ static bool ParseSingleAppTag(xmlNode* app_node, xmlNs* xml_namespace,
   // Find the url to the crx file.
   result->crx_url = GURL(GetAttribute(updatecheck, "codebase"));
   if (!result->crx_url.is_valid()) {
-    *error_detail = "Invalid codebase url";
+    *error_detail = "Invalid codebase url: '";
+    *error_detail += GetAttribute(updatecheck, "codebase");
+    *error_detail += "'.";
     return false;
   }
 
   // Get the version.
   result->version = GetAttribute(updatecheck, "version");
   if (result->version.length() == 0) {
-    *error_detail = "Missing version for updatecheck";
+    *error_detail = "Missing version for updatecheck.";
     return false;
   }
   scoped_ptr<Version> version(Version::GetVersionFromString(result->version));
   if (!version.get()) {
-    *error_detail = "Invalid version";
+    *error_detail = "Invalid version: '";
+    *error_detail += result->version;
+    *error_detail += "'.";
     return false;
   }
 
@@ -158,7 +162,9 @@ static bool ParseSingleAppTag(xmlNode* app_node, xmlNs* xml_namespace,
     scoped_ptr<Version> browser_min_version(
       Version::GetVersionFromString(result->browser_min_version));
     if (!browser_min_version.get()) {
-      *error_detail = "Invalid prodversionmin";
+      *error_detail = "Invalid prodversionmin: '";
+      *error_detail += result->browser_min_version;
+      *error_detail += "'.";
       return false;
     }
   }