Refactor PermissionsData pt1

chrome/common/extensions/manifest_handlers/app_isolation_info.cc

 // Copyright (c) 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 "chrome/common/extensions/manifest_handlers/app_isolation_info.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/manifest_constants.h"
+#include "extensions/common/manifest_handlers/permissions_parser.h"
 #include "extensions/common/permissions/api_permission_set.h"
-#include "extensions/common/permissions/permissions_data.h"
 
 namespace extensions {
 
 namespace keys = manifest_keys;
 
 AppIsolationInfo::AppIsolationInfo(bool isolated_storage)
     : has_isolated_storage(isolated_storage) {
 }
 
 AppIsolationInfo::~AppIsolationInfo() {
@@ skipping 15 matching lines @@
 bool AppIsolationHandler::Parse(Extension* extension, base::string16* error) {
   // Platform apps always get isolated storage.
   if (extension->is_platform_app()) {
     extension->SetManifestData(keys::kIsolation, new AppIsolationInfo(true));
     return true;
   }
 
   // Other apps only get it if it is requested _and_ experimental APIs are
   // enabled.
   if (!extension->is_app() ||
-      !PermissionsData::GetInitialAPIPermissions(extension)->count(
-          APIPermission::kExperimental)) {
+      !PermissionsParser::HasAPIPermission(extension,
+                                           APIPermission::kExperimental)) {
     return true;
   }
 
   // We should only be parsing if the extension has the key in the manifest,
   // or is a platform app (which we already handled).
   DCHECK(extension->manifest()->HasPath(keys::kIsolation));
 
   const base::ListValue* isolation_list = NULL;
   if (!extension->manifest()->GetList(keys::kIsolation, &isolation_list)) {
     *error = base::ASCIIToUTF16(manifest_errors::kInvalidIsolation);
@@ skipping 26 matching lines @@
 
 bool AppIsolationHandler::AlwaysParseForType(Manifest::Type type) const {
   return type == Manifest::TYPE_PLATFORM_APP;
 }
 
 const std::vector<std::string> AppIsolationHandler::Keys() const {
   return SingleKey(keys::kIsolation);
 }
 
 }  // namespace extensions