Implement chromium.self in content scripts, fix bugs

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 5c3d9b8f613780818851c37e27b8f042103ccc30..2f59115402d7a6ba7a7ef5f333e01d9fd9b6aa45 100644
--- a/chrome/browser/extensions/extension.h
+++ b/chrome/browser/extensions/extension.h
@@ -100,7 +100,10 @@ class Extension {
   }
 
   // Initialize the extension from a parsed manifest.
-  bool InitFromValue(const DictionaryValue& value, std::string* error);
+  // If |require_id| is true, will return an error if the "id" key is missing
+  // from the value.
+  bool InitFromValue(const DictionaryValue& value, bool require_id,
+                     std::string* error);
 
   // Returns an absolute path to a resource inside of an extension if the
   // extension has a theme defined with the given |resource_id|.  Otherwise
@@ -110,9 +113,8 @@ class Extension {
   FilePath GetThemeResourcePath(const int resource_id);
 
   const FilePath& path() const { return path_; }
-  const GURL& url();
+  const GURL& url() const { return extension_url_; }
   const std::string& id() const { return id_; }
-  void set_id(const std::string& id);
   const Version* version() const { return version_.get(); }
   // String representation of the version number.
   const std::string VersionString() const;