Refactor PermissionsData pt1

chrome/browser/extensions/api/permissions/permissions_api.cc

Index: chrome/browser/extensions/api/permissions/permissions_api.cc
diff --git a/chrome/browser/extensions/api/permissions/permissions_api.cc b/chrome/browser/extensions/api/permissions/permissions_api.cc
index 76f875da602e33dd4d525bf9245ece6e399ce32e..977afc9847dd8cd03fd6cebb15db787a463dae70 100644
--- a/chrome/browser/extensions/api/permissions/permissions_api.cc
+++ b/chrome/browser/extensions/api/permissions/permissions_api.cc
@@ -13,8 +13,8 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension.h"
+#include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/permission_message_provider.h"
-#include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/permissions_info.h"
 
 namespace extensions {
@@ -96,8 +96,8 @@ bool PermissionsRemoveFunction::RunSync() {
   }
 
   // Make sure we don't remove any required pemissions.
-  const PermissionSet* required =
-      PermissionsData::GetRequiredPermissions(extension);
+  scoped_refptr<const PermissionSet> required =
+      PermissionsParser::GetRequiredPermissions(extension);
   scoped_refptr<PermissionSet> intersection(
       PermissionSet::CreateIntersection(permissions.get(), required));
   if (!intersection->IsEmpty()) {
@@ -174,8 +174,8 @@ bool PermissionsRequestFunction::RunAsync() {
   }
 
   // The requested permissions must be defined as optional in the manifest.
-  if (!PermissionsData::GetOptionalPermissions(GetExtension())
-          ->Contains(*requested_permissions_.get())) {
+  if (!PermissionsParser::GetOptionalPermissions(GetExtension())
+           ->Contains(*requested_permissions_)) {
     error_ = kNotInOptionalPermissionsError;
     return false;
   }