Miscellaneous changes to Extension class in prep for user scripts

chrome/browser/extensions/extension.h

Index: chrome/browser/extensions/extension.h
diff --git a/chrome/browser/extensions/extension.h b/chrome/browser/extensions/extension.h
index 2b2f775851552f7f3c7b41d7a3d1f67710b27c5a..4a7d1086f4d7cf32d8d6b728b2a0fadf6dfcba2a 100644
--- a/chrome/browser/extensions/extension.h
+++ b/chrome/browser/extensions/extension.h
@@ -11,12 +11,13 @@
 #include "base/file_path.h"
 #include "base/string16.h"
 #include "base/values.h"
+#include "chrome/browser/extensions/user_script_master.h"
+#include "googleurl/src/gurl.h"
 
 // Represents a Chromium extension.
 class Extension {
  public:
-  Extension(){};
-  Extension(const FilePath& path) : path_(path) {};
+  Extension(const FilePath& path);
 
   // The format for extension manifests that this code understands.
   static const int kExpectedFormatVersion = 1;
@@ -25,26 +26,53 @@ class Extension {
   static const FilePath::CharType* kManifestFilename;
 
   // Keys used in JSON representation of extensions.
-  static const wchar_t* kFormatVersionKey;
-  static const wchar_t* kIdKey;
-  static const wchar_t* kNameKey;
-  static const wchar_t* kDescriptionKey;
-  static const wchar_t* kContentScriptsKey;
-  static const wchar_t* kVersionKey;
+  static const wchar_t* kDescriptionKey;
+  static const wchar_t* kFilesKey;
+  static const wchar_t* kFormatVersionKey;
+  static const wchar_t* kIdKey;
+  static const wchar_t* kMatchesKey;
+  static const wchar_t* kNameKey;
+  static const wchar_t* kUserScriptsKey;
+  static const wchar_t* kVersionKey;
 
   // Error messages returned from InitFromValue().
-  static const char* kInvalidFormatVersionError;
-  static const char* kInvalidManifestError;
-  static const char* kInvalidIdError;
-  static const char* kInvalidNameError;
-  static const char* kInvalidDescriptionError;
-  static const char* kInvalidContentScriptsListError;
-  static const char* kInvalidContentScriptError;
-  static const char* kInvalidVersionError;
+  static const char* kInvalidDescriptionError;
+  static const char* kInvalidFileCountError;
+  static const char* kInvalidFileError;
+  static const char* kInvalidFilesError;
+  static const char* kInvalidFormatVersionError;
+  static const char* kInvalidIdError;
+  static const char* kInvalidManifestError;
+  static const char* kInvalidMatchCountError;
+  static const char* kInvalidMatchError;
+  static const char* kInvalidMatchesError;
+  static const char* kInvalidNameError;
+  static const char* kInvalidUserScriptError;
+  static const char* kInvalidUserScriptsListError;
+  static const char* kInvalidVersionError;
+
+  // Creates an absolute url to a resource inside an extension. The
+  // |extension_url| argument should be the url() from an Extension object. The
+  // |relative_path| can be untrusted user input. The returned URL will either
+  // be invalid() or a child of |extension_url|.
+  // NOTE: Static so that it can be used from multiple threads.
+  static GURL GetResourceURL(const GURL& extension_url,
+                             const std::string& relative_path);
+
+  // Creates an absolute path to a resource inside an extension. The
+  // |extension_path| argument should be the path() from an Extension object.
+  // The |relative_path| can be untrusted user input. The returned path will
+  // either be empty or a child of extension_path.
+  // NOTE: Static so that it can be used from multiple threads.
+  static FilePath GetResourcePath(const FilePath& extension_path,
+                                  const std::string& relative_path);
 
   // The path to the folder the extension is stored in.
   const FilePath& path() const { return path_; }
 
+  // The base URL for the extension.
+  const GURL& url() const { return extension_url_; }
+
   // A human-readable ID for the extension. The convention is to use something
   // like 'com.example.myextension', but this is not currently enforced. An
   // extension's ID is used in things like directory structures and URLs, and
@@ -63,20 +91,20 @@ class Extension {
   const std::string& description() const { return description_; }
 
   // Paths to the content scripts that the extension contains.
-  const std::vector<std::string>& content_scripts() const {
-    return content_scripts_;
+  const UserScriptList& user_scripts() const {
+    return user_scripts_;
   }
 
   // Initialize the extension from a parsed manifest.
   bool InitFromValue(const DictionaryValue& value, std::string* error);
 
-  // Serialize the extension to a DictionaryValue.
-  void CopyToValue(DictionaryValue* value);
-
  private:
   // The path to the directory the extension is stored in.
   FilePath path_;
 
+  // The base extension url for the extension.
+  GURL extension_url_;
+
   // The extension's ID.
   std::string id_;
 
@@ -90,7 +118,7 @@ class Extension {
   std::string description_;
 
   // Paths to the content scripts the extension contains.
-  std::vector<std::string> content_scripts_;
+  UserScriptList user_scripts_;
 
   DISALLOW_COPY_AND_ASSIGN(Extension);
 };