Refactor PermissionsData pt1

extensions/common/extension.h

 // 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.
 
 #ifndef EXTENSIONS_COMMON_EXTENSION_H_
 #define EXTENSIONS_COMMON_EXTENSION_H_
 
 #include <algorithm>
 #include <iosfwd>
 #include <map>
@@ skipping 25 matching lines @@
 namespace base {
 class DictionaryValue;
 class Version;
 }
 
 namespace gfx {
 class ImageSkia;
 }
 
 namespace extensions {
-class PermissionsData;
 class APIPermissionSet;
 class ManifestPermissionSet;
 class PermissionSet;
+class PermissionsData;
+class PermissionsParser;
 
 // Uniquely identifies an Extension, using 32 characters from the alphabet
 // 'a'-'p'.  An empty string represents "no extension".
 //
 // Note: If this gets used heavily in files that don't otherwise need to include
 // extension.h, we should pull it into a dedicated header.
 typedef std::string ExtensionId;
 
 // Represents a Chrome extension.
 // Once created, an Extension object is immutable, with the exception of its
@@ skipping 242 matching lines @@
   const std::string& non_localized_name() const { return non_localized_name_; }
   // Base64-encoded version of the key used to sign this extension.
   // In pseudocode, returns
   // base::Base64Encode(RSAPrivateKey(pem_file).ExportPublicKey()).
   const std::string& public_key() const { return public_key_; }
   const std::string& description() const { return description_; }
   int manifest_version() const { return manifest_version_; }
   bool converted_from_user_script() const {
     return converted_from_user_script_;
   }
-  PermissionsData* permissions_data() { return permissions_data_.get(); }
+  PermissionsParser* permissions_parser() { return permissions_parser_.get(); }
+  const PermissionsParser* permissions_parser() const {
+    return permissions_parser_.get();
+  }

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

neither PermissionsParser nor PermissionsData belong here either. you might want
to mention that.

[not at google - send to devlin, 2014/06/03 14:39:36]

Thinking about this a bit more, PermissionsData *does* belong here,
PermissionsParser *does not*.
1- [conceptual] manifest handlers don't live on Extension
2- OTOH "active permissions" are fundamental to Extensions and we should be
encouraging people to use them not-awkwardly; so leave the permissions_data()
accessor.

(we should still be looking to remove the HasAPIPermission methods etc though)

If you agree with (2) then that's another avenue you could pursue for cleanups
in the CL, but go ahead with whatever is minimal churn.

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

Yeah, I came to the same conclusion (hence the todo on permissions data).  In a
cleanup CL, I'll see if I can't take out ForExtension().

+
   const PermissionsData* permissions_data() const {
     return permissions_data_.get();
   }
 
   // Appends |new_warning[s]| to install_warnings_.
   void AddInstallWarning(const InstallWarning& new_warning);
   void AddInstallWarnings(const std::vector<InstallWarning>& new_warnings);
   const std::vector<InstallWarning>& install_warnings() const {
     return install_warnings_;
   }
@@ skipping 98 matching lines @@
   // this member variable to 0 to distinguish the "uninitialized" case from
   // the case when we know the manifest version actually is 1.
   int manifest_version_;
 
   // The absolute path to the directory the extension is stored in.
   base::FilePath path_;
 
   // Defines the set of URLs in the extension's web content.
   URLPatternSet extent_;
 
+  // The parser for the manifest's permissions. This is NULL anytime not during
+  // initialization.
+  // TODO(rdevlin.cronin): This doesn't really belong here.
+  scoped_ptr<PermissionsParser> permissions_parser_;
+
+  // The active permissions for the extension.
   scoped_ptr<PermissionsData> permissions_data_;
 
   // Any warnings that occurred when trying to create/parse the extension.
   std::vector<InstallWarning> install_warnings_;
 
   // The base extension url for the extension.
   GURL extension_url_;
 
   // The extension's version.
   scoped_ptr<base::Version> version_;
@@ skipping 120 matching lines @@
 
   UpdatedExtensionPermissionsInfo(
       const Extension* extension,
       const PermissionSet* permissions,
       Reason reason);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_COMMON_EXTENSION_H_