Refactor PermissionsData pt1

extensions/common/manifest_handlers/background_info.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/manifest_handlers/background_info.h"
 
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/public/common/content_switches.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/file_util.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"
 #include "extensions/common/switches.h"
 #include "grit/extensions_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::ASCIIToUTF16;
 using base::DictionaryValue;
 
 namespace extensions {
 
 namespace keys = manifest_keys;
@@ skipping 160 matching lines @@
 
   std::string background_str;
   if (!background_page_value->GetAsString(&background_str)) {
     *error = ASCIIToUTF16(errors::kInvalidBackground);
     return false;
   }
 
   if (extension->is_hosted_app()) {
     background_url_ = GURL(background_str);
 
-    if (!PermissionsData::GetInitialAPIPermissions(extension)->count(
-            APIPermission::kBackground)) {
+    if (!PermissionsParser::HasAPIPermission(extension,
+                                             APIPermission::kBackground)) {
       *error = ASCIIToUTF16(errors::kBackgroundPermissionNeeded);
       return false;
     }
     // Hosted apps require an absolute URL.
     if (!background_url_.is_valid()) {
       *error = ASCIIToUTF16(errors::kInvalidBackgroundInHostedApp);
       return false;
     }
 
     if (!(background_url_.SchemeIs("https") ||
@@ skipping 78 matching lines @@
     return false;
 
   // Platform apps must have background pages or service workers.
   if (extension->is_platform_app() && !info->has_background_page() &&
       !info->has_service_worker()) {
     *error = ASCIIToUTF16(errors::kBackgroundRequiredForPlatformApps);
     return false;
   }
   // Lazy background pages are incompatible with the webRequest API.
   if (info->has_lazy_background_page() &&
-      PermissionsData::GetInitialAPIPermissions(extension)->count(
-          APIPermission::kWebRequest)) {
+      PermissionsParser::HasAPIPermission(extension,
+                                          APIPermission::kWebRequest)) {
     *error = ASCIIToUTF16(errors::kWebRequestConflictsWithLazyBackground);
     return false;
   }
 
   extension->SetManifestData(kBackground, info.release());
   return true;
 }
 
 bool BackgroundManifestHandler::Validate(
     const Extension* extension,
@@ skipping 41 matching lines @@
                                keys::kBackgroundPageLegacy,
                                keys::kBackgroundPersistent,
                                keys::kBackgroundScripts,
                                keys::kPlatformAppBackgroundPage,
                                keys::kPlatformAppBackgroundScripts,
                                keys::kPlatformAppServiceWorkerScript};
   return std::vector<std::string>(keys, keys + arraysize(keys));
 }
 
 }  // namespace extensions