Implement chromium.self in content scripts, fix bugs

chrome/common/extensions/user_script.h

Index: chrome/common/extensions/user_script.h
diff --git a/chrome/common/extensions/user_script.h b/chrome/common/extensions/user_script.h
index 1a8d6df7c3ae6050a3564c6a9c41468b84d8a4a3..070ead3798d80a71f776e2c7f28e3551d4b1cdfb 100644
--- a/chrome/common/extensions/user_script.h
+++ b/chrome/common/extensions/user_script.h
@@ -111,6 +111,11 @@ class UserScript {
   FileList& css_scripts() { return css_scripts_; }
   const FileList& css_scripts() const { return css_scripts_; }
 
+  const std::string& extension_id() const { return extension_id_; }
+  void set_extension_id(const std::string& id) { extension_id_ = id; }
+
+  bool is_standalone() { return extension_id_.empty(); }
+
   // Returns true if the script should be applied to the specified URL, false
   // otherwise.
   bool MatchesUrl(const GURL& url);
@@ -141,6 +146,10 @@ class UserScript {
 
   // List of css scripts defined in content_scripts
   FileList css_scripts_;
+
+  // The ID of the extension this script is a part of, if any. Can be empty if
+  // the script is a "standlone" user script.
+  std::string extension_id_;
 };
 
 typedef std::vector<UserScript> UserScriptList;