Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / common / extensions / permissions / settings_override_permission.cc

diff --git a/src/chrome/common/extensions/permissions/settings_override_permission.cc b/src/chrome/common/extensions/permissions/settings_override_permission.cc
index f5bf946..934bf98 100644 (file)
--- a/src/chrome/common/extensions/permissions/settings_override_permission.cc
+++ b/src/chrome/common/extensions/permissions/settings_override_permission.cc
@@ -8,7 +8,6 @@
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
-
 namespace extensions {
 
 SettingsOverrideAPIPermission::SettingsOverrideAPIPermission(
@@ -53,25 +52,23 @@ PermissionMessages SettingsOverrideAPIPermission::GetMessages() const {
 
 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::Clone() const {
 
 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_);
 }