Refactor PermissionsData pt1

extensions/common/extension.h

Index: extensions/common/extension.h
diff --git a/extensions/common/extension.h b/extensions/common/extension.h
index 797c906b40dd007382baf2744d94faa1597db3e7..1423adb7be57dda3fe1c4ac8c52d560cb201c311 100644
--- a/extensions/common/extension.h
+++ b/extensions/common/extension.h
@@ -43,10 +43,11 @@ 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".
@@ -309,7 +310,11 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   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();
   }
@@ -428,6 +433,12 @@ class Extension : public base::RefCountedThreadSafe<Extension> {
   // 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.