Extensions: Make it possible for permission parsing code to return a detailed error message.

chrome/common/extensions/permissions/settings_override_permission.cc

Index: chrome/common/extensions/permissions/settings_override_permission.cc
===================================================================
--- chrome/common/extensions/permissions/settings_override_permission.cc	(revision 247036)
+++ chrome/common/extensions/permissions/settings_override_permission.cc	(working copy)
@@ -8,7 +8,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-
 namespace extensions {
 
 SettingsOverrideAPIPermission::SettingsOverrideAPIPermission(
@@ -53,25 +52,23 @@
 
 bool SettingsOverrideAPIPermission::Check(
     const APIPermission::CheckParam* param) const {
-  return !param;
+  return (param == NULL);
 }
 
 bool SettingsOverrideAPIPermission::Contains(const APIPermission* rhs) const {
-  CHECK(info() == rhs->info());
+  CHECK_EQ(info(), rhs->info());
   return true;
 }
 
 bool SettingsOverrideAPIPermission::Equal(const APIPermission* rhs) const {
-  if (this == rhs)
-    return true;
-  CHECK(info() == rhs->info());
+  if (this != rhs)
+    CHECK_EQ(info(), rhs->info());
   return true;
 }
 
-bool SettingsOverrideAPIPermission::FromValue(const base::Value* value) {
-  if (value)
-    return false;
-  return true;
+bool SettingsOverrideAPIPermission::FromValue(const base::Value* value,
+                                              std::string* /*error*/) {
+  return (value == NULL);
 }
 
 scoped_ptr<base::Value> SettingsOverrideAPIPermission::ToValue() const {
@@ -84,19 +81,19 @@
 
 APIPermission* SettingsOverrideAPIPermission::Diff(
     const APIPermission* rhs) const {
-  CHECK(info() == rhs->info());
+  CHECK_EQ(info(), rhs->info());
   return NULL;
 }
 
 APIPermission* SettingsOverrideAPIPermission::Union(
     const APIPermission* rhs) const {
-  CHECK(info() == rhs->info());
+  CHECK_EQ(info(), rhs->info());
   return new SettingsOverrideAPIPermission(info(), setting_value_);
 }
 
 APIPermission* SettingsOverrideAPIPermission::Intersect(
     const APIPermission* rhs) const {
-  CHECK(info() == rhs->info());
+  CHECK_EQ(info(), rhs->info());
   return new SettingsOverrideAPIPermission(info(), setting_value_);
 }