Extract permission alias info from PermissionsProvider

extensions/common/permissions/permissions_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/permissions/permissions_info.h"
 
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
 #include "base/strings/string_util.h"
+#include "extensions/common/alias.h"
 
 namespace extensions {
 
 static base::LazyInstance<PermissionsInfo> g_permissions_info =
     LAZY_INSTANCE_INITIALIZER;
 
 // static
 PermissionsInfo* PermissionsInfo::GetInstance() {
   return g_permissions_info.Pointer();
 }
 
-void PermissionsInfo::AddProvider(const PermissionsProvider& provider) {
-  auto permissions = provider.GetAllPermissions();
-  auto aliases = provider.GetAllAliases();
+void PermissionsInfo::AddProvider(
+    const PermissionsProvider& permissions_provider,
+    const AliasProvider& alias_provider) {
+  auto permissions = permissions_provider.GetAllPermissions();
+  auto aliases = alias_provider.GetValidPermissionAliases();
 
   for (auto& permission : permissions)
     RegisterPermission(std::move(permission));
   for (const auto& alias : aliases)
-    RegisterAlias(alias.name, alias.alias);
+    RegisterAlias(alias);
 }
 
 const APIPermissionInfo* PermissionsInfo::GetByID(APIPermission::ID id) const {
   IDMap::const_iterator i = id_map_.find(id);
   return (i == id_map_.end()) ? nullptr : i->second.get();
 }
 
 const APIPermissionInfo* PermissionsInfo::GetByName(
     const std::string& name) const {
   NameMap::const_iterator i = name_map_.find(name);
@@ skipping 25 matching lines @@
   return base::StartsWith(i->first, name + '.', base::CompareCase::SENSITIVE);
 }
 
 PermissionsInfo::PermissionsInfo()
     : permission_count_(0) {
 }
 
 PermissionsInfo::~PermissionsInfo() {
 }
 
-void PermissionsInfo::RegisterAlias(
-    const char* name,
-    const char* alias) {
-  DCHECK(base::ContainsKey(name_map_, name));
-  DCHECK(!base::ContainsKey(name_map_, alias));
-  name_map_[alias] = name_map_[name];
+void PermissionsInfo::RegisterAlias(const Alias& alias) {
+  DCHECK(base::ContainsKey(name_map_, alias.real_name()));
+  DCHECK(!base::ContainsKey(name_map_, alias.name()));
+  name_map_[alias.name()] = name_map_[alias.real_name()];
 }
 
 void PermissionsInfo::RegisterPermission(
     std::unique_ptr<APIPermissionInfo> permission) {
   DCHECK(!base::ContainsKey(id_map_, permission->id()));
   DCHECK(!base::ContainsKey(name_map_, permission->name()));
 
   name_map_[permission->name()] = permission.get();
   id_map_[permission->id()] = std::move(permission);
 
   permission_count_++;
 }
 
 }  // namespace extensions