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

extensions/common/permissions/api_permission.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 "extensions/common/permissions/api_permission.h"
 
 #include "ui/base/l10n/l10n_util.h"
 
 namespace {
 
@@ skipping 19 matching lines @@
     result.push_back(GetMessage_());
     return result;
   }
 
   virtual bool Check(
       const APIPermission::CheckParam* param) const OVERRIDE {
     return !param;
   }
 
   virtual bool Contains(const APIPermission* rhs) const OVERRIDE {
-    CHECK(info() == rhs->info());
+    CHECK_EQ(info(), rhs->info());
     return true;
   }
 
   virtual bool Equal(const APIPermission* rhs) const OVERRIDE {
-    if (this == rhs)
-      return true;
-    CHECK(info() == rhs->info());
+    if (this != rhs)
+      CHECK_EQ(info(), rhs->info());
     return true;
   }
 
-  virtual bool FromValue(const base::Value* value) OVERRIDE {
-    if (value)
-      return false;
-    return true;
+  virtual bool FromValue(const base::Value* value,
+                         std::string* /*error*/) OVERRIDE {
+    return (value == NULL);
   }
 
   virtual scoped_ptr<base::Value> ToValue() const OVERRIDE {
     return scoped_ptr<base::Value>();
   }
 
   virtual APIPermission* Clone() const OVERRIDE {
     return new SimpleAPIPermission(info());
   }
 
   virtual APIPermission* Diff(const APIPermission* rhs) const OVERRIDE {
-    CHECK(info() == rhs->info());
+    CHECK_EQ(info(), rhs->info());
     return NULL;
   }
 
   virtual APIPermission* Union(const APIPermission* rhs) const OVERRIDE {
-    CHECK(info() == rhs->info());
+    CHECK_EQ(info(), rhs->info());
     return new SimpleAPIPermission(info());
   }
 
   virtual APIPermission* Intersect(const APIPermission* rhs) const OVERRIDE {
-    CHECK(info() == rhs->info());
+    CHECK_EQ(info(), rhs->info());
     return new SimpleAPIPermission(info());
   }
 
   virtual void Write(IPC::Message* m) const OVERRIDE { }
 
   virtual bool Read(const IPC::Message* m, PickleIterator* iter) OVERRIDE {
     return true;
   }
 
   virtual void Log(std::string* log) const OVERRIDE { }
@@ skipping 47 matching lines @@
   return api_permission_constructor_ ?
     api_permission_constructor_(this) : new SimpleAPIPermission(this);
 }
 
 PermissionMessage APIPermissionInfo::GetMessage_() const {
   return PermissionMessage(
       message_id_, l10n_util::GetStringUTF16(l10n_message_id_));
 }
 
 }  // namespace extensions