Refactor PermissionsData pt1

extensions/common/manifest_handlers/externally_connectable.cc

 // Copyright 2014 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/externally_connectable.h"
 
 #include <algorithm>
 
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "extensions/common/api/extensions_manifest_types.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"
 #include "extensions/common/url_pattern.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "url/gurl.h"
 
 namespace rcd = net::registry_controlled_domains;
 
 namespace extensions {
 
 namespace externally_connectable_errors {
 const char kErrorInvalidMatchPattern[] = "Invalid match pattern '*'";
@@ skipping 37 matching lines @@
   CHECK(extension->manifest()->Get(keys::kExternallyConnectable,
                                    &externally_connectable));
   std::vector<InstallWarning> install_warnings;
   scoped_ptr<ExternallyConnectableInfo> info =
       ExternallyConnectableInfo::FromValue(*externally_connectable,
                                            &install_warnings,
                                            error);
   if (!info)
     return false;
   if (!info->matches.is_empty()) {
-    PermissionsData::GetInitialAPIPermissions(extension)
-        ->insert(APIPermission::kWebConnectable);
+    PermissionsParser::AddAPIPermission(extension,
+                                        APIPermission::kWebConnectable);
   }
   extension->AddInstallWarnings(install_warnings);
   extension->SetManifestData(keys::kExternallyConnectable, info.release());
   return true;
 }
 
 const std::vector<std::string> ExternallyConnectableHandler::Keys() const {
   return SingleKey(keys::kExternallyConnectable);
 }
 
@@ skipping 124 matching lines @@
 }
 
 bool ExternallyConnectableInfo::IdCanConnect(const std::string& id) {
   if (all_ids)
     return true;
   DCHECK(base::STLIsSorted(ids));
   return std::binary_search(ids.begin(), ids.end(), id);
 }
 
 }  // namespace extensions