Index: chrome/browser/extensions/extension_permissions_api.cc |
diff --git a/chrome/browser/extensions/extension_permissions_api.cc b/chrome/browser/extensions/extension_permissions_api.cc |
index cbaa7192d5f3a6cef743893e8c98144dc404ef3d..a7bbda21809cd1ae644c7451c48515e12e5e6da7 100644 |
--- a/chrome/browser/extensions/extension_permissions_api.cc |
+++ b/chrome/browser/extensions/extension_permissions_api.cc |
@@ -40,13 +40,13 @@ DictionaryValue* PackPermissionsToValue(const ExtensionPermissionSet* set) { |
ExtensionPermissionsInfo* info = ExtensionPermissionsInfo::GetInstance(); |
for (ExtensionAPIPermissionSet::const_iterator i = set->apis().begin(); |
i != set->apis().end(); ++i) |
- apis->Append(Value::CreateStringValue(info->GetByID(*i)->name())); |
+ apis->Append(base::StringValue::New(info->GetByID(*i)->name())); |
// Generate the list of origin permissions. |
URLPatternSet hosts = set->explicit_hosts(); |
ListValue* origins = new ListValue(); |
for (URLPatternSet::const_iterator i = hosts.begin(); i != hosts.end(); ++i) |
- origins->Append(Value::CreateStringValue(i->GetAsString())); |
+ origins->Append(base::StringValue::New(i->GetAsString())); |
value->Set(keys::kApisKey, apis); |
value->Set(keys::kOriginsKey, origins); |
@@ -231,7 +231,7 @@ bool ContainsPermissionsFunction::RunImpl() { |
return false; |
CHECK(permissions.get()); |
- result_.reset(Value::CreateBooleanValue( |
+ result_.reset(base::BooleanValue::New( |
GetExtension()->GetActivePermissions()->Contains(*permissions))); |
return true; |
} |
@@ -276,12 +276,12 @@ bool RemovePermissionsFunction::RunImpl() { |
ExtensionPermissionSet::CreateIntersection(permissions.get(), required)); |
if (!intersection->IsEmpty()) { |
error_ = keys::kCantRemoveRequiredPermissionsError; |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
return false; |
} |
perms_manager->RemovePermissions(extension, permissions.get()); |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
return true; |
} |
@@ -326,7 +326,7 @@ bool RequestPermissionsFunction::RunImpl() { |
if (!extension_->optional_permission_set()->Contains( |
*requested_permissions_)) { |
error_ = keys::kNotInOptionalPermissionsError; |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
return false; |
} |
@@ -336,7 +336,7 @@ bool RequestPermissionsFunction::RunImpl() { |
prefs->GetGrantedPermissions(extension_->id()); |
if (granted && granted->Contains(*requested_permissions_)) { |
perms_manager->AddPermissions(extension_, requested_permissions_.get()); |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
SendResponse(true); |
return true; |
} |
@@ -372,7 +372,7 @@ void RequestPermissionsFunction::InstallUIProceed() { |
profile()->GetExtensionService()->permissions_manager(); |
install_ui_.reset(); |
- result_.reset(Value::CreateBooleanValue(true)); |
+ result_.reset(base::TrueValue()); |
perms_manager->AddPermissions(extension_, requested_permissions_.get()); |
SendResponse(true); |
@@ -382,7 +382,7 @@ void RequestPermissionsFunction::InstallUIProceed() { |
void RequestPermissionsFunction::InstallUIAbort(bool user_initiated) { |
install_ui_.reset(); |
- result_.reset(Value::CreateBooleanValue(false)); |
+ result_.reset(base::FalseValue()); |
requested_permissions_ = NULL; |
SendResponse(true); |