Refactor PermissionsData pt1

chrome/common/extensions/manifest_handlers/settings_overrides_handler.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 "chrome/common/extensions/manifest_handlers/settings_overrides_handler.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/values.h"
 #include "extensions/common/error_utils.h"
 #include "extensions/common/extension_set.h"
 #include "extensions/common/feature_switch.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/manifest_permission.h"
-#include "extensions/common/permissions/permissions_data.h"
 #include "extensions/common/permissions/permissions_info.h"
 #include "extensions/common/permissions/settings_override_permission.h"
 #include "grit/generated_resources.h"
 #include "ipc/ipc_message.h"
 #include "ipc/ipc_message_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "url/gurl.h"
 
 using extensions::api::manifest_types::ChromeSettingsOverrides;
 
@@ skipping 244 matching lines @@
   if (!info->bookmarks_ui && !info->homepage &&
       !info->search_engine && info->startup_pages.empty()) {
     *error = ErrorUtils::FormatErrorMessageUTF16(
         manifest_errors::kInvalidEmptyDictionary,
         manifest_keys::kSettingsOverride);
     return false;
   }
   info->manifest_permission.reset(new ManifestPermissionImpl(
       SettingsOverrides::RemovesBookmarkButton(*info)));
 
-  APIPermissionSet* permission_set =
-      PermissionsData::GetInitialAPIPermissions(extension);
-  DCHECK(permission_set);
   if (info->search_engine) {
-    permission_set->insert(new SettingsOverrideAPIPermission(
-        PermissionsInfo::GetInstance()->GetByID(APIPermission::kSearchProvider),
-        RemoveWwwPrefix(CreateManifestURL(info->search_engine->search_url)->
-            GetOrigin().host())));
+    PermissionsParser::AddAPIPermission(

[not at google - send to devlin, 2014/06/02 23:20:06]

here

[Devlin, 2014/06/03 15:28:21]

This is PermissionsParser, not PermissionsData.

+        extension,
+        new SettingsOverrideAPIPermission(
+            PermissionsInfo::GetInstance()->GetByID(
+                APIPermission::kSearchProvider),
+            RemoveWwwPrefix(CreateManifestURL(info->search_engine->search_url)
+                                ->GetOrigin()
+                                .host())));
   }
   if (!info->startup_pages.empty()) {
-    permission_set->insert(new SettingsOverrideAPIPermission(
-        PermissionsInfo::GetInstance()->GetByID(APIPermission::kStartupPages),
-        // We only support one startup page even though the type of the manifest
-        // property is a list, only the first one is used.
-        RemoveWwwPrefix(info->startup_pages[0].GetContent())));
+    PermissionsParser::AddAPIPermission(
+        extension,
+        new SettingsOverrideAPIPermission(
+            PermissionsInfo::GetInstance()->GetByID(
+                APIPermission::kStartupPages),
+            // We only support one startup page even though the type of the
+            // manifest
+            // property is a list, only the first one is used.
+            RemoveWwwPrefix(info->startup_pages[0].GetContent())));
   }
   if (info->homepage) {
-    permission_set->insert(new SettingsOverrideAPIPermission(
-        PermissionsInfo::GetInstance()->GetByID(APIPermission::kHomepage),
-        RemoveWwwPrefix(info->homepage.get()->GetContent())));
+    PermissionsParser::AddAPIPermission(
+        extension,
+        new SettingsOverrideAPIPermission(
+            PermissionsInfo::GetInstance()->GetByID(APIPermission::kHomepage),
+            RemoveWwwPrefix(info->homepage.get()->GetContent())));
   }
   extension->SetManifestData(manifest_keys::kSettingsOverride,
                              info.release());
   return true;
 }
 
 bool SettingsOverridesHandler::Validate(
     const Extension* extension,
     std::string* error,
     std::vector<InstallWarning>* warnings) const {
@@ skipping 28 matching lines @@
   const SettingsOverrides* data = SettingsOverrides::Get(extension);
   if (data)
     return data->manifest_permission->Clone();
   return NULL;
 }
 const std::vector<std::string> SettingsOverridesHandler::Keys() const {
   return SingleKey(manifest_keys::kSettingsOverride);
 }
 
 }  // namespace extensions